ec2.py: Make sure ec2_placement gets handled correctly

ec2_placement was missing from the inventory variables ec2.py was
producing.  Make sure that gets properly included rather than ignored.
pull/5899/head
Jack Neely 11 years ago
parent 0bc0315171
commit 42b01dac9b

@ -510,6 +510,8 @@ class Ec2Inventory(object):
instance_vars[key] = '' instance_vars[key] = ''
elif key == 'ec2_region': elif key == 'ec2_region':
instance_vars[key] = value.name instance_vars[key] = value.name
elif key == 'ec2__placement':
instance_vars['ec2_placement'] = value.zone
elif key == 'ec2_tags': elif key == 'ec2_tags':
for k, v in value.iteritems(): for k, v in value.iteritems():
key = self.to_safe('ec2_tag_' + k) key = self.to_safe('ec2_tag_' + k)

Loading…
Cancel
Save