From b95347822599f68ce8e121ef3323611d60cc530a Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Fri, 11 Dec 2020 21:44:51 -0500 Subject: [PATCH] Change the default EE location --- awx_collection/plugins/modules/tower_execution_environment.py | 2 +- .../ansible/roles/sources/templates/docker-compose.yml.j2 | 2 +- tools/docker-compose/bootstrap_development.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/awx_collection/plugins/modules/tower_execution_environment.py b/awx_collection/plugins/modules/tower_execution_environment.py index 486a24d949..280408f72a 100644 --- a/awx_collection/plugins/modules/tower_execution_environment.py +++ b/awx_collection/plugins/modules/tower_execution_environment.py @@ -58,7 +58,7 @@ EXAMPLES = ''' - name: Add EE to Tower tower_execution_environment: name: "My EE" - image: quay.io/awx/ee + image: quay.io/ansible/awx-ee ''' diff --git a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 index ea330d66f8..eae187cea6 100644 --- a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 +++ b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 @@ -44,7 +44,7 @@ services: # context: ./docker-compose # dockerfile: Dockerfile-logstash ee: - image: quay.io/awx/ee + image: quay.io/ansible/awx-ee user: ${CURRENT_UID} volumes: - "./docker-compose/receptor.cfg:/receptor.cfg" diff --git a/tools/docker-compose/bootstrap_development.sh b/tools/docker-compose/bootstrap_development.sh index 46fb917b08..3cc937c9c6 100755 --- a/tools/docker-compose/bootstrap_development.sh +++ b/tools/docker-compose/bootstrap_development.sh @@ -28,6 +28,6 @@ mkdir -p /awx_devel/awx/ui/static mkdir -p /awx_devel/awx/ui_next/build/static echo "ee, created = ExecutionEnvironment.objects.get_or_create(name='Default EE', \ - defaults={'image': 'quay.io/awx/ee', \ + defaults={'image': 'quay.io/ansible/awx-ee', \ 'managed_by_tower': True}); \ print('Already exists' if not created else 'Created')" | awx-manage shell_plus --quiet-load