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

implement playbook-dir option in ansible-inventory calls

Browse Source
This commit is contained in:
AlanCoding
2019-01-31 08:45:26 -05:00
parent caa5596386
commit e097f5a021
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@ import sys
import time import time
import traceback import traceback
import shutil import shutil
from distutils.version import LooseVersion as Version
# Django # Django
from django.conf import settings from django.conf import settings
@@ -37,6 +38,7 @@ from awx.main.utils import (
build_proot_temp_dir, build_proot_temp_dir,
get_licenser get_licenser
) )
from awx.main.utils.common import _get_ansible_version
from awx.main.signals import disable_activity_stream from awx.main.signals import disable_activity_stream
from awx.main.constants import STANDARD_INVENTORY_UPDATE_ENV from awx.main.constants import STANDARD_INVENTORY_UPDATE_ENV
@@ -124,13 +126,16 @@ class AnsibleInventoryLoader(object):
def get_base_args(self): def get_base_args(self):
# get ansible-inventory absolute path for running in bubblewrap/proot, in Popen # get ansible-inventory absolute path for running in bubblewrap/proot, in Popen
ansible_inventory_path = self.get_path_to_ansible_inventory()
# NOTE: why do we add "python" to the start of these args? # NOTE: why do we add "python" to the start of these args?
# the script that runs ansible-inventory specifies a python interpreter # the script that runs ansible-inventory specifies a python interpreter
# that makes no sense in light of the fact that we put all the dependencies # that makes no sense in light of the fact that we put all the dependencies
# inside of /venv/ansible, so we override the specified interpreter # inside of /venv/ansible, so we override the specified interpreter
# https://github.com/ansible/ansible/issues/50714 # https://github.com/ansible/ansible/issues/50714
bargs = ['python', self.get_path_to_ansible_inventory(), '-i', self.source] bargs = ['python', ansible_inventory_path, '-i', self.source]
ansible_version = _get_ansible_version(ansible_inventory_path[:-len('-inventory')])
if ansible_version != 'unknown' and Version(ansible_version) >= Version('2.5'):
bargs.extend(['--playbook-dir', self.source_dir])
logger.debug('Using base command: {}'.format(' '.join(bargs))) logger.debug('Using base command: {}'.format(' '.join(bargs)))
return bargs return bargs