diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py index 80dc2faa36..5b0bf5b206 100644 --- a/awx/main/management/commands/inventory_import.py +++ b/awx/main/management/commands/inventory_import.py @@ -85,10 +85,8 @@ class AnsibleInventoryLoader(object): env['ANSIBLE_INVENTORY_UNPARSED_FAILED'] = '1' venv_libdir = os.path.join(settings.ANSIBLE_VENV_PATH, "lib") env.pop('PYTHONPATH', None) # default to none if no python_ver matches - for python_ver in ["python2.7", "python2.6"]: - if os.path.isdir(os.path.join(venv_libdir, python_ver)): - env['PYTHONPATH'] = os.path.join(venv_libdir, python_ver, "site-packages") + ":" - break + if os.path.isdir(os.path.join(venv_libdir, "python2.7")): + env['PYTHONPATH'] = os.path.join(venv_libdir, "python2.7", "site-packages") + ":" return env def get_base_args(self): diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 22572d8139..b9fe68908d 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -622,10 +622,8 @@ class BaseTask(LogErrorsTask): env['PATH'] = os.path.join(settings.ANSIBLE_VENV_PATH, "bin") + ":" + env['PATH'] venv_libdir = os.path.join(settings.ANSIBLE_VENV_PATH, "lib") env.pop('PYTHONPATH', None) # default to none if no python_ver matches - for python_ver in ["python2.7", "python2.6"]: - if os.path.isdir(os.path.join(venv_libdir, python_ver)): - env['PYTHONPATH'] = os.path.join(venv_libdir, python_ver, "site-packages") + ":" - break + if os.path.isdir(os.path.join(venv_libdir, "python2.7")): + env['PYTHONPATH'] = os.path.join(venv_libdir, "python2.7", "site-packages") + ":" # Add awx/lib to PYTHONPATH. if add_awx_lib: env['PYTHONPATH'] = env.get('PYTHONPATH', '') + self.get_path_to('..', 'lib') + ':'