External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-06 00:47:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6833 from lewisface/devel

Browse Source 
Keystone v3 support for OpenStack Credential

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-04-27 18:13:52 +00:00
committed by GitHub
parent 83051e9138 c86692784e
commit 17702c94f7
5 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/credential/__init__.py
View File

@@ -799,6 +799,10 @@ ManagedCredentialType(
'id': 'project',
'label': ugettext_noop('Project (Tenant Name)'),
'type': 'string',
}, {
'id': 'project_domain_name',
'label': ugettext_noop('Project (Domain Name)'),
'type': 'string',
}, {
'id': 'domain',
'label': ugettext_noop('Domain Name'),

2
awx/main/models/credential/injectors.py
View File

@@ -77,6 +77,8 @@ def _openstack_data(cred):
username=cred.get_input('username', default=''),
password=cred.get_input('password', default=''),
project_name=cred.get_input('project', default=''))
if cred.has_input('project_domain_name'):
openstack_auth['project_domain_name'] = cred.get_input('project_domain_name', default='')
if cred.has_input('domain'):
openstack_auth['domain_name'] = cred.get_input('domain', default='')
verify_state = cred.get_input('verify_ssl', default=True)