External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 23:07:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update the inventory script to follow the new variabledata schema. This is untested and may need revisions.

Browse Source
This commit is contained in:
Michael DeHaan
2013-03-26 22:28:35 -04:00
parent ce7112e08a
commit 4a2673482b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/main/management/commands/acom_inventory.py
View File

@@ -44,12 +44,14 @@ class Command(NoArgsCommand):
groups = {} groups = {}
for group in inventory.groups.all(): for group in inventory.groups.all():
# FIXME: Check if group is active? # FIXME: Check if group is active?
group_info = { group_info = {
'hosts': list(group.hosts.values_list('name', flat=True)), 'hosts': list(group.hosts.values_list('name', flat=True)),
# FIXME: Include host vars here?
'vars': dict(group.variable_data.values_list('name', 'data')),
'children': list(group.children.values_list('name', flat=True)), 'children': list(group.children.values_list('name', flat=True)),
} }
if group.variables is not None:
group_info['vars'] = json.loads(group.variables.data)
group_info = dict(filter(lambda x: bool(x[1]), group_info.items())) group_info = dict(filter(lambda x: bool(x[1]), group_info.items()))
if group_info.keys() in ([], ['hosts']): if group_info.keys() in ([], ['hosts']):
groups[group.name] = group_info.get('hosts', []) groups[group.name] = group_info.get('hosts', [])
@@ -65,9 +67,11 @@ class Command(NoArgsCommand):
host = inventory.hosts.get(name=hostname) host = inventory.hosts.get(name=hostname)
except Host.DoesNotExist: except Host.DoesNotExist:
raise CommandError('Host %s not found in the given inventory' % hostname) raise CommandError('Host %s not found in the given inventory' % hostname)
hostvars = dict(host.variable_data.values_list('name', 'data')) hostvars = {}
if host.variables is not None:
hostvars = json.loads(host.variables.data)
# FIXME: Do we also need to include variables defined for groups of which # FIXME: Do we also need to include variables defined for groups of which
# this host is a member? # this host is a member? (MPD: pretty sure we don't!)
self.stdout.write(json.dumps(hostvars, indent=indent)) self.stdout.write(json.dumps(hostvars, indent=indent))
def handle_noargs(self, **options): def handle_noargs(self, **options):