Always use EE resolving logic

awx/main/management/commands/create_preload_data.py

@@ -68,12 +68,12 @@ class Command(BaseCommand):
                     print('Demo Credential, Inventory, and Job Template added.')
                     changed = True
 
-                default_ee = settings.AWX_EXECUTION_ENVIRONMENT_DEFAULT_IMAGE
-                ee, created = ExecutionEnvironment.objects.get_or_create(name='Default EE', defaults={'image': default_ee, 'managed_by_tower': True})
+                for ee in reversed(settings.DEFAULT_EXECUTION_ENVIRONMENTS):
+                    _, created = ExecutionEnvironment.objects.get_or_create(name=ee['name'], defaults={'image': ee['image'], 'managed_by_tower': True})
 
                 if created:
                     changed = True
-                    print('Default Execution Environment registered.')
+                    print('Default Execution Environment(s) registered.')
 
         if changed:
             print('(changed: True)')

awx/main/management/commands/inventory_import.py

@@ -29,6 +29,7 @@ from awx.main.utils.safe_yaml import sanitize_jinja
 # other AWX imports
 from awx.main.models.rbac import batch_role_ancestor_rebuilding
 from awx.main.utils import ignore_inventory_computed_fields, get_licenser
+from awx.main.utils.execution_environments import get_execution_environment_default
 from awx.main.signals import disable_activity_stream
 from awx.main.constants import STANDARD_INVENTORY_UPDATE_ENV
 from awx.main.utils.pglock import advisory_lock
@@ -90,7 +91,7 @@ class AnsibleInventoryLoader(object):
         bargs.extend(['-v', '{0}:{0}:Z'.format(self.source)])
         for key, value in STANDARD_INVENTORY_UPDATE_ENV.items():
             bargs.extend(['-e', '{0}={1}'.format(key, value)])
-        bargs.extend([settings.AWX_EXECUTION_ENVIRONMENT_DEFAULT_IMAGE])
+        bargs.extend([get_execution_environment_default().image])
         bargs.extend(['ansible-inventory', '-i', self.source])
         bargs.extend(['--playbook-dir', functioning_dir(self.source)])
         if self.verbosity:

awx/main/models/mixins.py

@@ -21,6 +21,7 @@ from django.utils.translation import ugettext_lazy as _
 from awx.main.models.base import prevent_search
 from awx.main.models.rbac import Role, RoleAncestorEntry, get_roles_on_resource
 from awx.main.utils import parse_yaml_or_json, get_custom_venv_choices, get_licenser, polymorphic
+from awx.main.utils.execution_environments import get_execution_environment_default
 from awx.main.utils.encryption import decrypt_value, get_encryption_key, is_encrypted
 from awx.main.utils.polymorphic import build_polymorphic_ctypes_map
 from awx.main.fields import JSONField, AskForField
@@ -461,13 +462,6 @@ class ExecutionEnvironmentMixin(models.Model):
         help_text=_('The container image to be used for execution.'),
     )
 
-    def get_execution_environment_default(self):
-        from awx.main.models.execution_environments import ExecutionEnvironment
-
-        if settings.DEFAULT_EXECUTION_ENVIRONMENT is not None:
-            return settings.DEFAULT_EXECUTION_ENVIRONMENT
-        return ExecutionEnvironment.objects.filter(organization=None, managed_by_tower=True).first()
-
     def resolve_execution_environment(self):
         """
         Return the execution environment that should be used when creating a new job.
@@ -482,7 +476,7 @@ class ExecutionEnvironmentMixin(models.Model):
             if self.inventory.organization.default_environment is not None:
                 return self.inventory.organization.default_environment
 
-        return self.get_execution_environment_default()
+        return get_execution_environment_default()
 
 
 class CustomVirtualEnvMixin(models.Model):

awx/main/utils/execution_environments.py

@@ -0,0 +1,9 @@
+from django.conf import settings
+
+from awx.main.models.execution_environments import ExecutionEnvironment
+
+
+def get_execution_environment_default():
+    if settings.DEFAULT_EXECUTION_ENVIRONMENT is not None:
+        return settings.DEFAULT_EXECUTION_ENVIRONMENT
+    return ExecutionEnvironment.objects.filter(organization=None, managed_by_tower=True).first()

awx/settings/defaults.py

@@ -68,17 +68,11 @@ DATABASES = {
 # the K8S cluster where awx itself is running)
 IS_K8S = False
 
-# TODO: remove this setting in favor of a default execution environment
-AWX_EXECUTION_ENVIRONMENT_DEFAULT_IMAGE = 'quay.io/ansible/awx-ee'
-
 AWX_CONTAINER_GROUP_K8S_API_TIMEOUT = 10
 AWX_CONTAINER_GROUP_POD_LAUNCH_RETRIES = 100
 AWX_CONTAINER_GROUP_POD_LAUNCH_RETRY_DELAY = 5
 AWX_CONTAINER_GROUP_DEFAULT_NAMESPACE = os.getenv('MY_POD_NAMESPACE', 'default')
 
-# TODO: remove this setting in favor of a default execution environment
-AWX_CONTAINER_GROUP_DEFAULT_IMAGE = AWX_EXECUTION_ENVIRONMENT_DEFAULT_IMAGE
-
 # Internationalization
 # https://docs.djangoproject.com/en/dev/topics/i18n/
 #
@@ -182,8 +176,15 @@ REMOTE_HOST_HEADERS = ['REMOTE_ADDR', 'REMOTE_HOST']
 PROXY_IP_ALLOWED_LIST = []
 
 CUSTOM_VENV_PATHS = []
+
+# Warning: this is a placeholder for a configure tower-in-tower setting
+# This should not be set via a file.
 DEFAULT_EXECUTION_ENVIRONMENT = None
 
+# This list is used for creating default EEs when running awx-manage create_preload_data.
+# Should be ordered from highest to lowest precedence.
+DEFAULT_EXECUTION_ENVIRONMENTS = [{'name': 'AWX EE 0.1.1', 'image': 'quay.io/ansible/awx-ee:0.1.1'}]
+
 # Note: This setting may be overridden by database settings.
 STDOUT_MAX_BYTES_DISPLAY = 1048576