External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-29 06:45:09 -02:30
Code Issues Packages Projects Releases Wiki Activity

Turns out "hostId" is not a good unique host identifier in openstack.

Browse Source 
Switching to use "id" instead.
This commit is contained in:
Matthew Jones
2015-04-23 16:02:44 -04:00
parent c45a422590
commit 19901ba7cf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/plugins/inventory/openstack.py
View File

@@ -103,7 +103,7 @@ class OpenStackInventory(object):
server_vars = meta['server_vars'] server_vars = meta['server_vars']
hostvars[server.name]['ansible_ssh_host'] = server_vars['interface_ip'] hostvars[server.name]['ansible_ssh_host'] = server_vars['interface_ip']
hostvars[server.name]['openstack'] = server_vars hostvars[server.name]['openstack'] = server_vars
hostvars[server.name]['hostId'] = server_vars['hostId'] hostvars[server.name]['id'] = server_vars['id']
for group in meta['groups']: for group in meta['groups']:
groups[group].append(server.name) groups[group].append(server.name)

2
awx/settings/defaults.py
View File

@@ -531,7 +531,7 @@ OPENSTACK_ENABLED_VALUE = 'ACTIVE'
OPENSTACK_GROUP_FILTER = r'^.+$' OPENSTACK_GROUP_FILTER = r'^.+$'
OPENSTACK_HOST_FILTER = r'^.+$' OPENSTACK_HOST_FILTER = r'^.+$'
OPENSTACK_EXCLUDE_EMPTY_GROUPS = True OPENSTACK_EXCLUDE_EMPTY_GROUPS = True
OPENSTACK_INSTANCE_ID_VAR = "hostId" OPENSTACK_INSTANCE_ID_VAR = "id"
# --------------------- # ---------------------
# -- Activity Stream -- # -- Activity Stream --