shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Add prefer_ipv4 to whitelist and add unit test for config value

Browse Source
This commit is contained in:
Richard Bywater 2018-02-02 08:54:54 +13:00
parent a737663dde
commit 6d69087db8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks.py
View File

@ -1822,7 +1822,7 @@ class RunInventoryUpdate(BaseTask):
cp.set(section, 'ssl_verify', "false") cp.set(section, 'ssl_verify', "false")
cloudforms_opts = dict(inventory_update.source_vars_dict.items()) cloudforms_opts = dict(inventory_update.source_vars_dict.items())
for opt in ['version', 'purge_actions', 'clean_group_keys', 'nest_tags', 'suffix']: for opt in ['version', 'purge_actions', 'clean_group_keys', 'nest_tags', 'suffix', 'prefer_ipv4']:
if opt in cloudforms_opts: if opt in cloudforms_opts:
cp.set(section, opt, cloudforms_opts[opt]) cp.set(section, opt, cloudforms_opts[opt])

3
awx/main/tests/unit/test_tasks.py
View File

@ -1757,6 +1757,8 @@ class TestInventoryUpdateCredentials(TestJobExecution):
self.instance.credential, 'password' self.instance.credential, 'password'
) )
self.instance.source_vars_dict['prefer_ipv4'] = True
def run_pexpect_side_effect(*args, **kwargs): def run_pexpect_side_effect(*args, **kwargs):
args, cwd, env, stdout = args args, cwd, env, stdout = args
config = ConfigParser.ConfigParser() config = ConfigParser.ConfigParser()
@ -1765,6 +1767,7 @@ class TestInventoryUpdateCredentials(TestJobExecution):
assert config.get('cloudforms', 'username') == 'bob' assert config.get('cloudforms', 'username') == 'bob'
assert config.get('cloudforms', 'password') == 'secret' assert config.get('cloudforms', 'password') == 'secret'
assert config.get('cloudforms', 'ssl_verify') == 'false' assert config.get('cloudforms', 'ssl_verify') == 'false'
assert config.get('cloudforms', 'prefer_ipv4') == 'true'
cache_path = config.get('cache', 'path') cache_path = config.get('cache', 'path')
assert cache_path.startswith(env['AWX_PRIVATE_DATA_DIR']) assert cache_path.startswith(env['AWX_PRIVATE_DATA_DIR'])