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

Stop sorting of termination_policies in ec2_asg (#4883)

Browse source 
The AWS API requires that any termination policy list that includes
`Default` must end with Default. The attribute sorting caused any list
of attributes to be lexically sorted, so a list like
`["OldestLaunchConfiguration", "Default"]` would be changed to
`["Default", "OldestLaunchConfiguration"]` because default is earlier
alphabetically. This caused calls to fail with BotoServerError per #4069

This commit also adds proper tracebacks to all botoservererror fail_json
calls.

Closes #4069
This commit is contained in:
Ryan Brown 2016-09-16 10:59:31 -04:00 committed by Matt Clay
parent 6a1290230b
commit 6dff21bd42
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/modules/cloud/amazon/ec2_asg.py
View file

@ -205,6 +205,7 @@ to "replace_instances":
import time import time
import logging as log import logging as log
import traceback
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.ec2 import * from ansible.module_utils.ec2 import *
@ -443,7 +444,7 @@ def create_autoscaling_group(connection, module):
changed = True changed = True
return(changed, asg_properties) return(changed, asg_properties)
except BotoServerError as e: except BotoServerError as e:
module.fail_json(msg=str(e)) module.fail_json(msg="Failed to create Autoscaling Group: %s" % str(e), exception=traceback.format_exc(e))
else: else:
as_group = as_groups[0] as_group = as_groups[0]
changed = False changed = False
@ -455,14 +456,15 @@ def create_autoscaling_group(connection, module):
group_attr = getattr(as_group, attr) group_attr = getattr(as_group, attr)
# we do this because AWS and the module may return the same list # we do this because AWS and the module may return the same list
# sorted differently # sorted differently
try: if attr != 'termination_policies':
module_attr.sort() try:
except: module_attr.sort()
pass except:
try: pass
group_attr.sort() try:
except: group_attr.sort()
pass except:
pass
if group_attr != module_attr: if group_attr != module_attr:
changed = True changed = True
setattr(as_group, attr, module_attr) setattr(as_group, attr, module_attr)
@ -498,7 +500,7 @@ def create_autoscaling_group(connection, module):
try: try:
as_group.update() as_group.update()
except BotoServerError as e: except BotoServerError as e:
module.fail_json(msg=str(e)) module.fail_json(msg="Failed to update Autoscaling Group: %s" % str(e), exception=traceback.format_exc(e))
if wait_for_instances: if wait_for_instances:
wait_for_new_inst(module, connection, group_name, wait_timeout, desired_capacity, 'viable_instances') wait_for_new_inst(module, connection, group_name, wait_timeout, desired_capacity, 'viable_instances')
@ -507,7 +509,7 @@ def create_autoscaling_group(connection, module):
as_group = connection.get_all_groups(names=[group_name])[0] as_group = connection.get_all_groups(names=[group_name])[0]
asg_properties = get_properties(as_group) asg_properties = get_properties(as_group)
except BotoServerError as e: except BotoServerError as e:
module.fail_json(msg=str(e)) module.fail_json(msg="Failed to read existing Autoscaling Groups: %s" % str(e), exception=traceback.format_exc(e))
return(changed, asg_properties) return(changed, asg_properties)