summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Brown <sb@ryansb.com>2016-11-26 08:53:26 -0500
committerGitHub <noreply@github.com>2016-11-26 08:53:26 -0500
commite1e64c5aef636aaa4e5e697d02cfcbefef4365b8 (patch)
treeaab32756d070a86942376db846e92442b0de38df
parentdedfe2becfaa45096fff1e35fef522a2cdf5e09a (diff)
parentef2f130591ec7217a93933c527f50b52b68af109 (diff)
downloadansible-modules-core-e1e64c5aef636aaa4e5e697d02cfcbefef4365b8.tar.gz
Merge pull request #5552 from tedder/cloudformation_fix_5551_format_zero_length_field
cloudformation: add .format indexes for 2.6 compatability
-rw-r--r--cloud/amazon/cloudformation.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloud/amazon/cloudformation.py b/cloud/amazon/cloudformation.py
index 9d6a1b8b..2cf26785 100644
--- a/cloud/amazon/cloudformation.py
+++ b/cloud/amazon/cloudformation.py
@@ -261,11 +261,11 @@ def get_stack_events(cfn, stack_name):
return ret
for e in events.get('StackEvents', []):
- eventline = 'StackEvent {} {} {}'.format(e['ResourceType'], e['LogicalResourceId'], e['ResourceStatus'])
+ eventline = 'StackEvent {ResourceType} {LogicalResourceId} {ResourceStatus}'.format(**e)
ret['events'].append(eventline)
if e['ResourceStatus'].endswith('FAILED'):
- failline = '{} {} {}: {}'.format(e['ResourceType'], e['LogicalResourceId'], e['ResourceStatus'], e['ResourceStatusReason'])
+ failline = '{ResourceType} {LogicalResourceId} {ResourceStatus}: {ResourceStatusReason}'.format(**e)
ret['log'].append(failline)
return ret