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

Merge pull request #4842 from cchurch/devel

Browse source 
Retrieve EC2 state when using newer versions of Boto
This commit is contained in:
Michael DeHaan 2013-11-18 11:45:56 -08:00
parent f18acee779 a6135c1c16
commit 30e72a4b1b
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/inventory/ec2.py
View file

@ -502,7 +502,14 @@ class Ec2Inventory(object):
key = self.to_safe('ec2_' + key)
# Handle complex types
if type(value) in [int, bool]:
# state/previous_state changed to properties in boto in https://github.com/boto/boto/commit/a23c379837f698212252720d2af8dec0325c9518
if key == 'ec2__state':
instance_vars['ec2_state'] = instance.state or ''
instance_vars['ec2_state_code'] = instance.state_code
elif key == 'ec2__previous_state':
instance_vars['ec2_previous_state'] = instance.previous_state or ''
instance_vars['ec2_previous_state_code'] = instance.previous_state_code
elif type(value) in [int, bool]:
instance_vars[key] = value
elif type(value) in [str, unicode]:
instance_vars[key] = value.strip()