Merge pull request #6773 from ryanpetrello/playbook-scan-symlinks

follow symlinks while discovering valid playbooks Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
ansible · Apr 22, 2020 · 28c3fa5 · 28c3fa5
2 parents 9cfecb5 + 3dd21d7
commit 28c3fa5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py
@@ -199,7 +199,7 @@ def playbooks(self):
         results = []
         project_path = self.get_project_path()
         if project_path:
-            for dirpath, dirnames, filenames in os.walk(smart_str(project_path)):
+            for dirpath, dirnames, filenames in os.walk(smart_str(project_path), followlinks=True):
                 if skip_directory(dirpath):
                     continue
                 for filename in filenames:

diff --git a/awx/main/utils/ansible.py b/awx/main/utils/ansible.py
@@ -64,6 +64,7 @@ def could_be_playbook(project_path, dir_path, filename):
                 matched = True
                 break
     except IOError:
+        logger.exception(f'failed to open {playbook_path}')
         return None
     if not matched:
         return None