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

Fix openstack and logic and update some tests

Browse Source
This commit is contained in:
AlanCoding
2020-05-01 09:53:02 -04:00
parent b2bdb0c81d
commit ec3c4de1f7
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/models/inventory.py
View File

@@ -2277,6 +2277,13 @@ class openstack(PluginFileInjector):
ret['inventory_hostname'] = use_host_name_for_name(source_vars['use_hostnames'])
return ret
def get_plugin_env(self, inventory_update, private_data_dir, private_data_files):
env = super(openstack, self).get_plugin_env(inventory_update, private_data_dir, private_data_files)
credential = inventory_update.get_cloud_credential()
cred_data = private_data_files['credentials']
env['OS_CLIENT_CONFIG_FILE'] = cred_data[credential]
return env
class rhv(PluginFileInjector):
"""ovirt uses the custom credential templating, and that is all