cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add an expand_csv_tags setting to ec2.ini

Browse source 
If enabled, this will convert tags of the form "a,b,c" to a list and use
the results to create additional inventory groups.

This is based on PR #8676 by nickpeck (but not a straight rebase—both
the code and the nomenclature have been changed here).

Closes #8676
This commit is contained in:
Abhijit Menon-Sen 2015-10-06 12:18:43 +05:30
parent 7fd8b86a10
commit e6a9b2cae5
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/inventory/ec2.ini
View file

@ -97,6 +97,10 @@ nested_groups = False
# Replace - tags when creating groups to avoid issues with ansible # Replace - tags when creating groups to avoid issues with ansible
replace_dash_in_groups = True replace_dash_in_groups = True
# If set to true, any tag of the form "a,b,c" is expanded into a list
# and the results are used to create additional tag_* inventory groups.
expand_csv_tags = False
# The EC2 inventory output can become very large. To manage its size, # The EC2 inventory output can become very large. To manage its size,
# configure which groups should be created. # configure which groups should be created.
group_by_instance_id = True group_by_instance_id = True

28
contrib/inventory/ec2.py
View file

@ -141,6 +141,7 @@ except ImportError:
class Ec2Inventory(object): class Ec2Inventory(object):
def _empty_inventory(self): def _empty_inventory(self):
return {"_meta" : {"hostvars" : {}}} return {"_meta" : {"hostvars" : {}}}
@ -321,6 +322,11 @@ class Ec2Inventory(object):
self.cache_path_index = cache_dir + "/ansible-ec2.index" self.cache_path_index = cache_dir + "/ansible-ec2.index"
self.cache_max_age = config.getint('ec2', 'cache_max_age') self.cache_max_age = config.getint('ec2', 'cache_max_age')
if config.has_option('ec2', 'expand_csv_tags'):
self.expand_csv_tags = config.getboolean('ec2', 'expand_csv_tags')
else:
self.expand_csv_tags = False
# Configure nested groups instead of flat namespace. # Configure nested groups instead of flat namespace.
if config.has_option('ec2', 'nested_groups'): if config.has_option('ec2', 'nested_groups'):
self.nested_groups = config.getboolean('ec2', 'nested_groups') self.nested_groups = config.getboolean('ec2', 'nested_groups')
@ -696,15 +702,21 @@ class Ec2Inventory(object):
# Inventory: Group by tag keys # Inventory: Group by tag keys
if self.group_by_tag_keys: if self.group_by_tag_keys:
for k, v in instance.tags.items(): for k, v in instance.tags.items():
if v: if self.expand_csv_tags and v and ',' in v:
key = self.to_safe("tag_" + k + "=" + v) values = map(lambda x: x.strip(), v.split(','))
else: else:
key = self.to_safe("tag_" + k) values = [v]
self.push(self.inventory, key, dest)
if self.nested_groups: for v in values:
self.push_group(self.inventory, 'tags', self.to_safe("tag_" + k))
if v: if v:
self.push_group(self.inventory, self.to_safe("tag_" + k), key) key = self.to_safe("tag_" + k + "=" + v)
else:
key = self.to_safe("tag_" + k)
self.push(self.inventory, key, dest)
if self.nested_groups:
self.push_group(self.inventory, 'tags', self.to_safe("tag_" + k))
if v:
self.push_group(self.inventory, self.to_safe("tag_" + k), key)
# Inventory: Group by Route53 domain names if enabled # Inventory: Group by Route53 domain names if enabled
if self.route53_enabled and self.group_by_route53_names: if self.route53_enabled and self.group_by_route53_names:
@ -1120,6 +1132,8 @@ class Ec2Inventory(object):
instance_vars['ec2_placement'] = value.zone instance_vars['ec2_placement'] = value.zone
elif key == 'ec2_tags': elif key == 'ec2_tags':
for k, v in value.items(): for k, v in value.items():
if self.expand_csv_tags and ',' in v:
v = map(lambda x: x.strip(), v.split(','))
key = self.to_safe('ec2_tag_' + k) key = self.to_safe('ec2_tag_' + k)
instance_vars[key] = v instance_vars[key] = v
elif key == 'ec2_groups': elif key == 'ec2_groups':