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

Merge pull request #975 from ansible/m-o-e-fix-ec2_asg

Browse source 
Fixes to broken tag handling in ec2_asg
This commit is contained in:
Toshio Kuratomi 2015-03-20 11:35:52 -07:00
commit 0101904da5
1 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
cloud/amazon/ec2_asg.py
View file

@ -224,6 +224,16 @@ def enforce_required_arguments(module):
def get_properties(autoscaling_group): def get_properties(autoscaling_group):
properties = dict((attr, getattr(autoscaling_group, attr)) for attr in ASG_ATTRIBUTES) properties = dict((attr, getattr(autoscaling_group, attr)) for attr in ASG_ATTRIBUTES)
# Ugly hack to make this JSON-serializable. We take a list of boto Tag
# objects and replace them with a dict-representation. Needed because the
# tags are included in ansible's return value (which is jsonified)
if 'tags' in properties and isinstance(properties['tags'], list):
serializable_tags = {}
for tag in properties['tags']:
serializable_tags[tag.key] = [tag.value, tag.propagate_at_launch]
properties['tags'] = serializable_tags
properties['healthy_instances'] = 0 properties['healthy_instances'] = 0
properties['in_service_instances'] = 0 properties['in_service_instances'] = 0
properties['unhealthy_instances'] = 0 properties['unhealthy_instances'] = 0
@ -326,18 +336,12 @@ def create_autoscaling_group(connection, module):
asg_tags = [] asg_tags = []
for tag in set_tags: for tag in set_tags:
if tag.has_key('key') and tag.has_key('value'): # this block is to support depricated form for k,v in tag.iteritems():
asg_tags.append(Tag(key=tag.get('key'), if k !='propagate_at_launch':
value=tag.get('value'), asg_tags.append(Tag(key=k,
propagate_at_launch=bool(tag.get('propagate_at_launch', True)), value=v,
resource_id=group_name)) propagate_at_launch=bool(tag.get('propagate_at_launch', True)),
else: resource_id=group_name))
for k,v in tag.iteritems():
if k !='propagate_at_launch':
asg_tags.append(Tag(key=k,
value=v,
propagate_at_launch=bool(tag.get('propagate_at_launch', True)),
resource_id=group_name))
if not as_groups: if not as_groups:
if not vpc_zone_identifier and not availability_zones: if not vpc_zone_identifier and not availability_zones:
@ -393,30 +397,25 @@ def create_autoscaling_group(connection, module):
setattr(as_group, attr, module_attr) setattr(as_group, attr, module_attr)
if len(set_tags) > 0: if len(set_tags) > 0:
existing_tags = as_group.tags have_tags = {}
existing_tag_map = dict((tag.key, tag) for tag in existing_tags) want_tags = {}
for tag in set_tags:
if tag.has_key('key') and tag.has_key('value'): # this is to support deprecated method for tag in asg_tags:
if 'key' not in tag: want_tags[tag.key] = [tag.value, tag.propagate_at_launch]
continue
if ( not tag['key'] in existing_tag_map or dead_tags = []
existing_tag_map[tag['key']].value != tag['value'] or for tag in as_group.tags:
('propagate_at_launch' in tag and have_tags[tag.key] = [tag.value, tag.propagate_at_launch]
existing_tag_map[tag['key']].propagate_at_launch != tag['propagate_at_launch']) ): if not tag.key in want_tags:
changed = True changed = True
continue dead_tags.append(tag)
else:
for k,v in tag.iteritems(): if dead_tags != []:
if k !='propagate_at_launch': connection.delete_tags(dead_tags)
if ( not k in existing_tag_map or
existing_tag_map[k].value != v or if have_tags != want_tags:
('propagate_at_launch' in tag and changed = True
existing_tag_map[k].propagate_at_launch != tag['propagate_at_launch']) ):
changed = True
continue
if changed:
connection.create_or_update_tags(asg_tags) connection.create_or_update_tags(asg_tags)
as_group.tags = asg_tags
# handle loadbalancers separately because None != [] # handle loadbalancers separately because None != []
load_balancers = module.params.get('load_balancers') or [] load_balancers = module.params.get('load_balancers') or []