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

sync tower verify_ssl parameter with tower-cli

Browse Source 
Add new input for the tower type credential
elsewhere, tests are being added for verify_ssl in modules
tower-cli also updating to use the original tower.py var
This commit is contained in:
AlanCoding
2018-03-19 09:30:47 -04:00
parent e58038b056
commit 9db0fdfc0b
4 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/plugins/inventory/tower.py
View File

@@ -54,7 +54,14 @@ def parse_configuration():
host_name = os.environ.get("TOWER_HOST", None)
username = os.environ.get("TOWER_USERNAME", None)
password = os.environ.get("TOWER_PASSWORD", None)
ignore_ssl = os.environ.get("TOWER_IGNORE_SSL", "1").lower() in ("1", "yes", "true")
ignore_ssl = False
ssl_negative_var = os.environ.get("TOWER_IGNORE_SSL", None)
if ssl_negative_var:
ignore_ssl = ssl_negative_var.lower() in ("1", "yes", "true")
else:
ssl_positive_var = os.environ.get("TOWER_VERIFY_SSL", None)
if ssl_positive_var:
ignore_ssl = ssl_positive_var.lower() not in ('true', '1', 't', 'y', 'yes')
inventory = os.environ.get("TOWER_INVENTORY", None)
license_type = os.environ.get("TOWER_LICENSE_TYPE", "enterprise")