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

properly handle Galaxy credentials if a Project is orphaned

Browse Source
This commit is contained in:
Ryan Petrello
2020-08-11 10:26:54 -04:00
parent a869d7da35
commit 4046b18eff
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tasks.py
View File

@@ -2030,6 +2030,7 @@ class RunProjectUpdate(BaseTask):
# build out env vars for Galaxy credentials (in order) # build out env vars for Galaxy credentials (in order)
galaxy_server_list = [] galaxy_server_list = []
if project_update.project.organization:
for i, cred in enumerate( for i, cred in enumerate(
project_update.project.organization.galaxy_credentials.all() project_update.project.organization.galaxy_credentials.all()
): ):
@@ -2118,7 +2119,10 @@ class RunProjectUpdate(BaseTask):
elif not scm_branch: elif not scm_branch:
scm_branch = {'hg': 'tip'}.get(project_update.scm_type, 'HEAD') scm_branch = {'hg': 'tip'}.get(project_update.scm_type, 'HEAD')
galaxy_creds_are_defined = project_update.project.organization.galaxy_credentials.exists() galaxy_creds_are_defined = (
project_update.project.organization and
project_update.project.organization.galaxy_credentials.exists()
)
if not galaxy_creds_are_defined and ( if not galaxy_creds_are_defined and (
settings.AWX_ROLES_ENABLED or settings.AWX_COLLECTIONS_ENABLED settings.AWX_ROLES_ENABLED or settings.AWX_COLLECTIONS_ENABLED
): ):