From d759aff4e911eec5acb20866c90c87e32a3ab2af Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Thu, 2 Jan 2020 15:20:38 -0500
Subject: [PATCH] Do not allow state where no Galaxy servers are enabled

---
 awx/main/conf.py  | 5 +++++
 awx/main/tasks.py | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/awx/main/conf.py b/awx/main/conf.py
index 4d00bf37e2..293c4b9c3a 100644
--- a/awx/main/conf.py
+++ b/awx/main/conf.py
@@ -903,6 +903,11 @@ def galaxy_validate(serializer, attrs):
             setting_name = '{}{}'.format(prefix, k.upper())
             errors.setdefault(setting_name, [])
             errors[setting_name].append(msg)
+    if not galaxy_data['url']:
+        if _new_value('PUBLIC_GALAXY_ENABLED') is False:
+            errors.setdefault('PUBLIC_GALAXY_ENABLED', [])
+            msg = _('A URL for Primary Galaxy must be defined before disabling public Galaxy.')
+            errors['PUBLIC_GALAXY_ENABLED'].append(msg)
 
     if errors:
         raise serializers.ValidationError(errors)
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 928bb2162f..69e5c2873c 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -1989,8 +1989,9 @@ class RunProjectUpdate(BaseTask):
                     continue
                 env_key = ('ANSIBLE_GALAXY_SERVER_{}_{}'.format(server.get('id', 'unnamed'), key)).upper()
                 env[env_key] = server[key]
-        # now set the precedence of galaxy servers
-        env['ANSIBLE_GALAXY_SERVER_LIST'] = ','.join([server.get('id', 'unnamed') for server in galaxy_servers])
+        if galaxy_servers:
+            # now set the precedence of galaxy servers
+            env['ANSIBLE_GALAXY_SERVER_LIST'] = ','.join([server.get('id', 'unnamed') for server in galaxy_servers])
         return env
 
     def _build_scm_url_extra_vars(self, project_update):