From d79f73ab7a97da4aab5f13ee17f71ee319b0c6d8 Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Fri, 4 Jun 2021 10:25:56 -0400 Subject: [PATCH] Remove references to Ansible venv path because it does not exist --- awx/main/management/commands/inventory_import.py | 10 ++-------- awx/settings/development.py | 1 - awx/settings/production.py | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py index f220c0a6ee..e3f8ac5ab3 100644 --- a/awx/main/management/commands/inventory_import.py +++ b/awx/main/management/commands/inventory_import.py @@ -66,13 +66,9 @@ class AnsibleInventoryLoader(object): /usr/bin/ansible/ansible-inventory -i hosts --list """ - def __init__(self, source, venv_path=None, verbosity=0): + def __init__(self, source, verbosity=0): self.source = source self.verbosity = verbosity - if venv_path: - self.venv_path = venv_path - else: - self.venv_path = settings.ANSIBLE_VENV_PATH def get_base_args(self): bargs = ['podman', 'run', '--user=root', '--quiet'] @@ -131,7 +127,6 @@ class Command(BaseCommand): def add_arguments(self, parser): parser.add_argument('--inventory-name', dest='inventory_name', type=str, default=None, metavar='n', help='name of inventory to sync') parser.add_argument('--inventory-id', dest='inventory_id', type=int, default=None, metavar='i', help='id of inventory to sync') - parser.add_argument('--venv', dest='venv', type=str, default=None, help='absolute path to the AWX custom virtualenv to use') parser.add_argument('--overwrite', dest='overwrite', action='store_true', default=False, help='overwrite the destination hosts and groups') parser.add_argument('--overwrite-vars', dest='overwrite_vars', action='store_true', default=False, help='overwrite (rather than merge) variables') parser.add_argument('--keep-vars', dest='keep_vars', action='store_true', default=False, help='DEPRECATED legacy option, has no effect') @@ -824,7 +819,6 @@ class Command(BaseCommand): raise CommandError('--source is required') verbosity = int(options.get('verbosity', 1)) self.set_logging_level(verbosity) - venv_path = options.get('venv', None) # Load inventory object based on name or ID. if inventory_id: @@ -854,7 +848,7 @@ class Command(BaseCommand): _eager_fields=dict(job_args=json.dumps(sys.argv), job_env=dict(os.environ.items()), job_cwd=os.getcwd()) ) - data = AnsibleInventoryLoader(source=source, venv_path=venv_path, verbosity=verbosity).load() + data = AnsibleInventoryLoader(source=source, verbosity=verbosity).load() logger.debug('Finished loading from source: %s', source) diff --git a/awx/settings/development.py b/awx/settings/development.py index 7c9d86b39a..3c41dde684 100644 --- a/awx/settings/development.py +++ b/awx/settings/development.py @@ -95,7 +95,6 @@ include(optional('/etc/tower/settings.py'), scope=locals()) include(optional('/etc/tower/conf.d/*.py'), scope=locals()) BASE_VENV_PATH = "/var/lib/awx/venv/" -ANSIBLE_VENV_PATH = os.path.join(BASE_VENV_PATH, "ansible") AWX_VENV_PATH = os.path.join(BASE_VENV_PATH, "awx") # If any local_*.py files are present in awx/settings/, use them to override diff --git a/awx/settings/production.py b/awx/settings/production.py index f912b6727e..e2bcbd54b7 100644 --- a/awx/settings/production.py +++ b/awx/settings/production.py @@ -35,7 +35,6 @@ SCHEDULE_METADATA_LOCATION = '/var/lib/awx/.tower_cycle' # Ansible base virtualenv paths and enablement BASE_VENV_PATH = os.path.realpath("/var/lib/awx/venv") -ANSIBLE_VENV_PATH = os.path.join(BASE_VENV_PATH, "ansible") # Base virtualenv paths and enablement AWX_VENV_PATH = os.path.join(BASE_VENV_PATH, "awx")