From 19901ba7cf7735f31122df802abfadd62c9224bb Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 23 Apr 2015 16:02:44 -0400 Subject: [PATCH] Turns out "hostId" is not a good unique host identifier in openstack. Switching to use "id" instead. --- awx/plugins/inventory/openstack.py | 2 +- awx/settings/defaults.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/plugins/inventory/openstack.py b/awx/plugins/inventory/openstack.py index b3cfc54444..ecf4b9ce00 100755 --- a/awx/plugins/inventory/openstack.py +++ b/awx/plugins/inventory/openstack.py @@ -103,7 +103,7 @@ class OpenStackInventory(object): server_vars = meta['server_vars'] hostvars[server.name]['ansible_ssh_host'] = server_vars['interface_ip'] 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']: groups[group].append(server.name) diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 016b662885..18146a9042 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -531,7 +531,7 @@ OPENSTACK_ENABLED_VALUE = 'ACTIVE' OPENSTACK_GROUP_FILTER = r'^.+$' OPENSTACK_HOST_FILTER = r'^.+$' OPENSTACK_EXCLUDE_EMPTY_GROUPS = True -OPENSTACK_INSTANCE_ID_VAR = "hostId" +OPENSTACK_INSTANCE_ID_VAR = "id" # --------------------- # -- Activity Stream --