External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-06 18:49:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Align inventory variables with Ansible modules

Browse Source
This commit is contained in:
Matthew Jones
2017-10-26 16:40:10 -04:00
parent 5f3ebc26e0
commit 85be3c7692
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1090,7 +1090,7 @@ def tower(cls):
}, },
injectors={ injectors={
'env': { 'env': {
'TOWER_HOSTNAME': '{{host}}', 'TOWER_HOST': '{{host}}',
'TOWER_USERNAME': '{{username}}', 'TOWER_USERNAME': '{{username}}',
'TOWER_PASSWORD': '{{password}}', 'TOWER_PASSWORD': '{{password}}',
} }

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

@@ -51,7 +51,7 @@ def parse_configuration():
help='Return all hosts known to Tower given a particular inventory', help='Return all hosts known to Tower given a particular inventory',
) )
parser.parse_args() parser.parse_args()
host_name = os.environ.get("TOWER_HOSTNAME", None) host_name = os.environ.get("TOWER_HOST", None)
username = os.environ.get("TOWER_USERNAME", None) username = os.environ.get("TOWER_USERNAME", None)
password = os.environ.get("TOWER_PASSWORD", None) password = os.environ.get("TOWER_PASSWORD", None)
ignore_ssl = os.environ.get("TOWER_IGNORE_SSL", "1").lower() in ("1", "yes", "true") ignore_ssl = os.environ.get("TOWER_IGNORE_SSL", "1").lower() in ("1", "yes", "true")
@@ -60,7 +60,7 @@ def parse_configuration():
errors = [] errors = []
if not host_name: if not host_name:
errors.append("Missing TOWER_HOSTNAME in environment") errors.append("Missing TOWER_HOST in environment")
if not username: if not username:
errors.append("Missing TOWER_USERNAME in environment") errors.append("Missing TOWER_USERNAME in environment")
if not password: if not password: