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

Merge pull request #4482 from wenottingham/dadgumit

Browse Source 
Fix env var.
This commit is contained in:
Bill Nottingham
2016-12-19 11:40:55 -05:00
committed by GitHub
parent 4f9d2fbde3 9f48043574
commit 291dca0954
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks.py
View File

@@ -878,7 +878,7 @@ class RunJob(BaseTask):
authorize = network_cred.authorize authorize = network_cred.authorize
env['ANSIBLE_NET_AUTHORIZE'] = unicode(int(authorize)) env['ANSIBLE_NET_AUTHORIZE'] = unicode(int(authorize))
if authorize: if authorize:
env['ANSIBLE_NET_AUTHORIZE_PASSWORD'] = decrypt_field(network_cred, 'authorize_password') env['ANSIBLE_NET_AUTH_PASS'] = decrypt_field(network_cred, 'authorize_password')
# Set environment variables related to scan jobs # Set environment variables related to scan jobs
if job.job_type == PERM_INVENTORY_SCAN: if job.job_type == PERM_INVENTORY_SCAN:

2
awx/main/tests/unit/test_network_credential.py
View File

@@ -46,7 +46,7 @@ def test_net_cred_parse(mocker):
assert env['ANSIBLE_NET_USERNAME'] == options['username'] assert env['ANSIBLE_NET_USERNAME'] == options['username']
assert env['ANSIBLE_NET_PASSWORD'] == options['password'] assert env['ANSIBLE_NET_PASSWORD'] == options['password']
assert env['ANSIBLE_NET_AUTHORIZE'] == '1' assert env['ANSIBLE_NET_AUTHORIZE'] == '1'
assert env['ANSIBLE_NET_AUTHORIZE_PASSWORD'] == options['authorize_password'] assert env['ANSIBLE_NET_AUTH_PASS'] == options['authorize_password']
def test_net_cred_ssh_agent(mocker, get_ssh_version): def test_net_cred_ssh_agent(mocker, get_ssh_version):