External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-18 13:11:19 -03:30
Code Issues Packages Projects Releases Wiki Activity

Workaround for bug in Ansible core where 127.0.0.1/localhost must be explicitly in the all group

Browse Source 
for dynamic inventory plugins.  Github has also been filed for ansible core but can't rev it for release.
This commit is contained in:
Michael DeHaan 2013-07-28 20:50:56 -04:00
parent 92bfddb834
commit 9fc8c0725c
2 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
awx/main/tests/scripts.py
View File

@ -93,6 +93,11 @@ class InventoryScriptTest(BaseScriptTest):
if x in (3, 7):
host.mark_inactive()
hosts.append(host)
# add localhost just to make sure it's thrown into all (Ansible github bug)
local = inventory.hosts.create(name='localhost', inventory=inventory, variables={})
hosts.append(local)
self.hosts.extend(hosts)
groups = []
for x in xrange(5):
@ -110,6 +115,8 @@ class InventoryScriptTest(BaseScriptTest):
group.hosts.add(hosts[x + 5])
if n > 0 and x == 4:
group.parents.add(groups[3])
if x == 4:
group.hosts.add(local)
self.groups.extend(groups)
def run_inventory_script(self, *args, **options):
@ -136,19 +143,28 @@ class InventoryScriptTest(BaseScriptTest):
self.assertEqual(rc, 0, stderr)
data = json.loads(stdout)
groups = inventory.groups.filter(active=True)
groupnames = groups.values_list('name', flat=True)
groupnames = [ x for x in groups.values_list('name', flat=True)]
# it's ok for all to be here because due to an Ansible inventory workaround
# 127.0.0.1/localhost must show up in the all group
groupnames.append('all')
self.assertEqual(set(data.keys()), set(groupnames))
# Groups for this inventory should only have hosts, and no group
# variable data or parent/child relationships.
for k,v in data.items():
self.assertTrue(isinstance(v, dict))
self.assertTrue(isinstance(v['children'], (list,tuple)))
self.assertTrue(isinstance(v['hosts'], (list,tuple)))
self.assertTrue(isinstance(v['vars'], (dict)))
group = inventory.groups.get(active=True, name=k)
hosts = group.hosts.filter(active=True)
hostnames = hosts.values_list('name', flat=True)
self.assertEqual(set(v['hosts']), set(hostnames))
if k != 'all':
self.assertTrue(isinstance(v, dict))
self.assertTrue(isinstance(v['children'], (list,tuple)))
self.assertTrue(isinstance(v['hosts'], (list,tuple)))
self.assertTrue(isinstance(v['vars'], (dict)))
group = inventory.groups.get(active=True, name=k)
hosts = group.hosts.filter(active=True)
hostnames = hosts.values_list('name', flat=True)
self.assertEqual(set(v['hosts']), set(hostnames))
else:
self.assertTrue(v['hosts'] == [ 'localhost' ])
for group in inventory.groups.filter(active=False):
self.assertFalse(group.name in data.keys(),
'deleted group %s should not be in data' % group)

18
awx/main/views.py
View File

@ -589,10 +589,28 @@ class InventoryScriptView(RetrieveAPIView):
data[group.name] = group_info.get('hosts', [])
else:
data[group.name] = group_info
if self.object.variables_dict:
data['all'] = {
'vars': self.object.variables_dict,
}
# workaround for Ansible inventory bug (github #3687), localhost must
# be explicitly listed in the all group for dynamic inventory
# scripts to pick it up
localhost = Host.objects.filter(inventory=self.object, name='localhost').count()
localhost2 = Host.objects.filter(inventory=self.object, name='127.0.0.1').count()
if localhost or localhost2:
if not 'all' in data:
data['all'] = {}
data['all']['hosts'] = []
if localhost:
data['all']['hosts'].append('localhost')
if localhost2:
data['all']['hosts'].append('127.0.0.1')
return Response(data)
class JobTemplateList(ListCreateAPIView):