Support retrieving EC2 state/previous_state when using newer versions of Boto.

This commit is contained in:
Chris Church 2013-11-07 16:04:55 -05:00
parent 898de833b0
commit a6135c1c16

View file

@ -496,7 +496,14 @@ class Ec2Inventory(object):
key = self.to_safe('ec2_' + key) key = self.to_safe('ec2_' + key)
# Handle complex types # 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 instance_vars[key] = value
elif type(value) in [str, unicode]: elif type(value) in [str, unicode]:
instance_vars[key] = value.strip() instance_vars[key] = value.strip()