External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-29 13:45:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7360 from jladdjr/foreman_backwards_compat_for_ssl_verify

Browse Source 
[foreman] add backwards support for ssl_verify in foreman plugin

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-06-17 19:46:53 +00:00
committed by GitHub
parent 2df67c4dc8 91cd5b359a
commit 9e118b8a0c
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/models/inventory.py
View File

@@ -2596,6 +2596,7 @@ class satellite6(PluginFileInjector):
def inventory_as_dict(self, inventory_update, private_data_dir):
ret = super(satellite6, self).inventory_as_dict(inventory_update, private_data_dir)
ret['validate_certs'] = False
group_patterns = '[]'
group_prefix = 'foreman_'
@@ -2615,6 +2616,10 @@ class satellite6(PluginFileInjector):
want_ansible_ssh_host = v
elif k == 'satellite6_want_facts' and isinstance(v, bool):
want_facts = v
# add backwards support for ssl_verify
# plugin uses new option, validate_certs, instead
elif k == 'ssl_verify' and isinstance(v, bool):
ret['validate_certs'] = v
else:
ret[k] = str(v)