From ec40f62c4d842b26f6dd4a79e10a29149329fb38 Mon Sep 17 00:00:00 2001 From: "Christian M. Adams" Date: Mon, 22 Feb 2021 18:28:08 -0500 Subject: [PATCH] Mount SECRET_KEY into dev env & document it --- tools/docker-compose/ansible/roles/sources/tasks/main.yml | 6 ++++++ .../ansible/roles/sources/templates/docker-compose.yml.j2 | 1 + tools/docker-compose/docs/data_migration.md | 2 ++ 3 files changed, 9 insertions(+) diff --git a/tools/docker-compose/ansible/roles/sources/tasks/main.yml b/tools/docker-compose/ansible/roles/sources/tasks/main.yml index db2edee006..33ace141f1 100644 --- a/tools/docker-compose/ansible/roles/sources/tasks/main.yml +++ b/tools/docker-compose/ansible/roles/sources/tasks/main.yml @@ -30,6 +30,12 @@ when: not lookup('vars', item.item, default='') loop: "{{ secrets.results }}" +- name: Write out SECRET_KEY + copy: + content: "{{ secret_key }}" + dest: "{{ sources_dest }}/SECRET_KEY" + no_log: true + - name: Render configuration templates template: src: "{{ item }}.j2" 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 b639dcced8..72181cfb0b 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 @@ -30,6 +30,7 @@ services: - "../../docker-compose/_sources/database.py:/etc/tower/conf.d/database.py" - "../../docker-compose/_sources/websocket_secret.py:/etc/tower/conf.d/websocket_secret.py" - "../../docker-compose/_sources/local_settings.py:/etc/tower/conf.d/local_settings.py" + - "../../docker-compose/_sources/SECRET_KEY:/etc/tower/SECRET_KEY" - "redis_socket:/var/run/redis/:rw" privileged: true tty: true diff --git a/tools/docker-compose/docs/data_migration.md b/tools/docker-compose/docs/data_migration.md index afd107be89..af36850226 100644 --- a/tools/docker-compose/docs/data_migration.md +++ b/tools/docker-compose/docs/data_migration.md @@ -5,6 +5,8 @@ migrate your data to the development environment via the migrate.yml playbook, o > Note: This will also convert your postgresql bind-mount into a docker volume. +First, in the `inventory` file, set your `pg_password`, `broadcast_websocket_secret`, `secret_key`, and any other settings you need for your deployment. **Make sure you use the same secret key value you had with your previous Local Docker deployment.** + ### Migrate data with migrate.yml If you had a custom pgdocker or awxcompose location, you will need to set the `postgres_data_dir` and `old_docker_compose_dir` variables.