External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-05 10:41:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #537 from ryanpetrello/ovirt4-auth-module

Browse Source 
properly support authentication for ovirt4 ansible modules
This commit is contained in:
Ryan Petrello
2017-10-19 09:57:16 -04:00
committed by GitHub
parent b1f5529aa4 c1e20fe7a0
commit 57cd8adc2d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/models/credential.py
View File

@@ -1041,6 +1041,10 @@ def ovirt4(cls):
'required': ['host', 'username', 'password'], 'required': ['host', 'username', 'password'],
}, },
injectors={ injectors={
# The duplication here is intentional; the ovirt4 inventory plugin
# writes a .ini file for authentication, while the ansible modules for
# ovirt4 use a separate authentication process that support
# environment variables; by injecting both, we support both
'file': { 'file': {
'template': '\n'.join([ 'template': '\n'.join([
'[ovirt]', '[ovirt]',
@@ -1050,7 +1054,10 @@ def ovirt4(cls):
'{% if ca_file %}ovirt_ca_file={{ca_file}}{% endif %}']) '{% if ca_file %}ovirt_ca_file={{ca_file}}{% endif %}'])
}, },
'env': { 'env': {
'OVIRT_INI_PATH': '{{tower.filename}}' 'OVIRT_INI_PATH': '{{tower.filename}}',
'OVIRT_URL': '{{host}}',
'OVIRT_USERNAME': '{{username}}',
'OVIRT_PASSWORD': '{{password}}'
} }
}, },
) )