From d752e6ce6d07d432432707a212acd9eca001d91b Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Fri, 26 Aug 2022 11:23:55 -0400 Subject: [PATCH] Allow for setting custom admin password in dev environment --- Makefile | 3 ++- tools/docker-compose/ansible/roles/sources/tasks/main.yml | 1 + .../ansible/roles/sources/templates/docker-compose.yml.j2 | 1 + tools/docker-compose/bootstrap_development.sh | 5 ++--- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b4efc99975..b2cd8afec2 100644 --- a/Makefile +++ b/Makefile @@ -469,7 +469,8 @@ docker-compose-sources: .git/hooks/pre-commit -e enable_ldap=$(LDAP) \ -e enable_splunk=$(SPLUNK) \ -e enable_prometheus=$(PROMETHEUS) \ - -e enable_grafana=$(GRAFANA) + -e enable_grafana=$(GRAFANA) \ + -e admin_password=$(ADMIN_PASSWORD) docker-compose: awx/projects docker-compose-sources diff --git a/tools/docker-compose/ansible/roles/sources/tasks/main.yml b/tools/docker-compose/ansible/roles/sources/tasks/main.yml index 05b5b9facf..64a8fec36a 100644 --- a/tools/docker-compose/ansible/roles/sources/tasks/main.yml +++ b/tools/docker-compose/ansible/roles/sources/tasks/main.yml @@ -18,6 +18,7 @@ - pg_password - secret_key - broadcast_websocket_secret + - admin_password - name: Generate secrets if needed template: 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 87e50fbaa8..bf6ac44e03 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 @@ -22,6 +22,7 @@ services: CONTROL_PLANE_NODE_COUNT: {{ control_plane_node_count|int }} EXECUTION_NODE_COUNT: {{ execution_node_count|int }} AWX_LOGGING_MODE: stdout + DJANGO_SUPERUSER_PASSWORD: {{ admin_password }} {% if loop.index == 1 %} RUN_MIGRATIONS: 1 {% endif %} diff --git a/tools/docker-compose/bootstrap_development.sh b/tools/docker-compose/bootstrap_development.sh index d97d5fdfca..f470e6624e 100755 --- a/tools/docker-compose/bootstrap_development.sh +++ b/tools/docker-compose/bootstrap_development.sh @@ -21,10 +21,9 @@ fi if output=$(awx-manage createsuperuser --noinput --username=admin --email=admin@localhost 2> /dev/null); then echo $output - admin_password=$(openssl rand -base64 12) - echo "Admin password: ${admin_password}" - awx-manage update_password --username=admin --password=${admin_password} fi +echo "Admin password: ${DJANGO_SUPERUSER_PASSWORD}" + awx-manage create_preload_data awx-manage register_default_execution_environments