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

Merge branch 'openstack_inventory_support' into upstream_master

Browse Source 
* openstack_inventory_support:
  Use inventory_source source_vars to control what address we use for ansible_ssh_host
  Some small changes to tower openstack work
This commit is contained in:
Matthew Jones
2015-04-23 11:09:41 -04:00
parent 13aa8fce82 abdfb26b3d
commit 405be7edd8
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,7 @@ class OpenStackInventory(object):
self.openstack_config = os_client_config.config.OpenStackConfig(
config_files)
self.clouds = shade.openstack_clouds(self.openstack_config)
self.refresh = refresh
self.refresh = True
self.cache_max_age = self.openstack_config.get_cache_max_age()
cache_path = self.openstack_config.get_cache_path()
@@ -101,9 +101,9 @@ class OpenStackInventory(object):
continue
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]['hostId'] = server_vars['hostId']
for group in meta['groups']:
groups[group].append(server.name)