From 00e60d269835416a2dea0e41ce356a97dbceed53 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 1 Jun 2021 12:05:31 -0400 Subject: [PATCH] Add additional controller directory for collections for inventory update --- awx/main/tasks.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index e242be4b7a..e5bfacf483 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -2391,6 +2391,12 @@ class RunInventoryUpdate(BaseTask): paths = [config_values[config_setting]] + paths paths = [os.path.join(CONTAINER_ROOT, folder)] + paths env[env_key] = os.pathsep.join(paths) + if 'ANSIBLE_COLLECTIONS_PATHS' in env: + paths = env['ANSIBLE_COLLECTIONS_PATHS'].split(':') + else: + paths = ['~/.ansible/collections', '/usr/share/ansible/collections'] + paths.append('/usr/share/automation-controller/collections') + env['ANSIBLE_COLLECTIONS_PATHS'] = os.pathsep.join(paths) return env