zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-05 05:31:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add keystone v3 support via new domain field on credential

Browse Source
This commit is contained in:
AlanCoding
2016-03-01 09:33:17 -05:00
parent edabf23c6a
commit c807d5dcf3
5 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@@ -712,6 +712,8 @@ class RunJob(BaseTask):
username=credential.username,
password=decrypt_field(credential, "password"),
project_name=credential.project)
if credential.domain not in (None, ''):
openstack_auth['domain_name'] = credential.domain
openstack_data = {
'clouds': {
'devstack': {
@@ -1151,6 +1153,8 @@ class RunInventoryUpdate(BaseTask):
username=credential.username,
password=decrypt_field(credential, "password"),
project_name=credential.project)
if credential.domain not in (None, ''):
openstack_auth['domain_name'] = credential.domain
private_state = str(inventory_update.source_vars_dict.get('private', 'true'))
# Retrieve cache path from inventory update vars if available,
# otherwise create a temporary cache path only for this update.