External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 10:27:37 -02: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

3
awx/main/tasks.py
View File

@@ -938,7 +938,8 @@ class RunInventoryUpdate(BaseTask):
username=credential.username,
password=decrypt_field(credential, "password"),
project_name=credential.project)
openstack_data = {"clouds": {"devstack": {"auth": openstack_auth}}}
private_state = str(inventory_update.source_vars_dict.get("private", "true"))
openstack_data = {"clouds": {"devstack": {"private": private_state, "auth": openstack_auth}}}
return yaml.safe_dump(openstack_data, default_flow_style=False, allow_unicode=True)
cp = ConfigParser.ConfigParser()