Incorporate OpenStack inventory changes from https://github.com/ansible/ansible/pull/11447 back into Tower.

This commit is contained in:
Chris Church
2015-08-10 15:49:12 -04:00
parent 4480c05d4e
commit 6c409404ba
3 changed files with 4 additions and 5 deletions
+1 -1
View File
@@ -1153,7 +1153,7 @@ class RunInventoryUpdate(BaseTask):
env['GCE_PROJECT'] = passwords.get('source_project', '')
env['GCE_PEM_FILE_PATH'] = cloud_credential
elif inventory_update.source == 'openstack':
env['OPENSTACK_CONFIG_FILE'] = cloud_credential
env['OS_CLIENT_CONFIG_FILE'] = cloud_credential
elif inventory_update.source == 'file':
# FIXME: Parse source_env to dict, update env.
pass