Merge pull request #9336 from dpkirchner/devel

Added _meta hostvars key to gce.py plugin
pull/9388/head
James Cammarata 10 years ago
commit e8f675003f

@ -233,9 +233,14 @@ class GceInventory(object):
def group_instances(self): def group_instances(self):
'''Group all instances''' '''Group all instances'''
groups = {} groups = {}
meta = {}
meta["hostvars"] = {}
for node in self.driver.list_nodes(): for node in self.driver.list_nodes():
name = node.name name = node.name
meta["hostvars"][name] = self.node_to_dict(node)
zone = node.extra['zone'].name zone = node.extra['zone'].name
if groups.has_key(zone): groups[zone].append(name) if groups.has_key(zone): groups[zone].append(name)
else: groups[zone] = [name] else: groups[zone] = [name]
@ -263,6 +268,9 @@ class GceInventory(object):
stat = 'status_%s' % status.lower() stat = 'status_%s' % status.lower()
if groups.has_key(stat): groups[stat].append(name) if groups.has_key(stat): groups[stat].append(name)
else: groups[stat] = [name] else: groups[stat] = [name]
groups["_meta"] = meta
return groups return groups
def json_format_dict(self, data, pretty=False): def json_format_dict(self, data, pretty=False):

Loading…
Cancel
Save