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

Re-order authfile option to make inventory import command work

Browse Source
This commit is contained in:
Alan Rominger
2021-10-28 15:25:45 -04:00
committed by Shane McDonald
parent db7fb81855
commit d42fe921db
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/management/commands/inventory_import.py
View File

@@ -80,7 +80,6 @@ class AnsibleInventoryLoader(object):
for key, value in STANDARD_INVENTORY_UPDATE_ENV.items(): for key, value in STANDARD_INVENTORY_UPDATE_ENV.items():
bargs.extend(['-e', '{0}={1}'.format(key, value)]) bargs.extend(['-e', '{0}={1}'.format(key, value)])
ee = get_default_execution_environment() ee = get_default_execution_environment()
bargs.extend([ee.image])
if ee.credential: if ee.credential:
if not ee.credential.has_inputs(field_names=('host', 'username', 'password')): if not ee.credential.has_inputs(field_names=('host', 'username', 'password')):
@@ -97,6 +96,8 @@ class AnsibleInventoryLoader(object):
if ee.pull: if ee.pull:
bargs.append(f'--pull={ee.pull}') bargs.append(f'--pull={ee.pull}')
bargs.extend([ee.image])
bargs.extend(['ansible-inventory', '-i', self.source]) bargs.extend(['ansible-inventory', '-i', self.source])
bargs.extend(['--playbook-dir', functioning_dir(self.source)]) bargs.extend(['--playbook-dir', functioning_dir(self.source)])
if self.verbosity: if self.verbosity: