From a6135c1c1650f48267c18991d6dba00054af8730 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Thu, 7 Nov 2013 16:04:55 -0500 Subject: [PATCH] Support retrieving EC2 state/previous_state when using newer versions of Boto. --- plugins/inventory/ec2.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/inventory/ec2.py b/plugins/inventory/ec2.py index 27d724ea538..b0586d4ae27 100755 --- a/plugins/inventory/ec2.py +++ b/plugins/inventory/ec2.py @@ -496,7 +496,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()