From 1198c067b21d5cd0f6d06991da9d61b02c0ace31 Mon Sep 17 00:00:00 2001 From: Andrea Galbusera Date: Wed, 19 Jun 2019 12:19:02 +0200 Subject: [PATCH] ensure "create_preload_data" is honored in docker-compose deployments Use a templated version of launch_awx_task.sh which conditionally preloads sample data according to create_preload_data value. --- installer/roles/image_build/tasks/main.yml | 4 ++-- .../launch_awx_task.sh => templates/launch_awx_task.sh.j2} | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) rename installer/roles/image_build/{files/launch_awx_task.sh => templates/launch_awx_task.sh.j2} (97%) diff --git a/installer/roles/image_build/tasks/main.yml b/installer/roles/image_build/tasks/main.yml index 1cfb962126..d69c9c4659 100644 --- a/installer/roles/image_build/tasks/main.yml +++ b/installer/roles/image_build/tasks/main.yml @@ -124,8 +124,8 @@ delegate_to: localhost - name: Stage launch_awx_task - copy: - src: launch_awx_task.sh + template: + src: launch_awx_task.sh.j2 dest: "{{ docker_base_path }}/launch_awx_task.sh" mode: '0700' delegate_to: localhost diff --git a/installer/roles/image_build/files/launch_awx_task.sh b/installer/roles/image_build/templates/launch_awx_task.sh.j2 similarity index 97% rename from installer/roles/image_build/files/launch_awx_task.sh rename to installer/roles/image_build/templates/launch_awx_task.sh.j2 index 2c26e5ce63..c908ad3f62 100755 --- a/installer/roles/image_build/files/launch_awx_task.sh +++ b/installer/roles/image_build/templates/launch_awx_task.sh.j2 @@ -18,7 +18,9 @@ fi if [ ! -z "$AWX_ADMIN_USER" ]&&[ ! -z "$AWX_ADMIN_PASSWORD" ]; then echo "from django.contrib.auth.models import User; User.objects.create_superuser('$AWX_ADMIN_USER', 'root@localhost', '$AWX_ADMIN_PASSWORD')" | awx-manage shell + {% if create_preload_data %} awx-manage create_preload_data + {% endif %} fi echo 'from django.conf import settings; x = settings.AWX_TASK_ENV; x["HOME"] = "/var/lib/awx"; settings.AWX_TASK_ENV = x' | awx-manage shell awx-manage provision_instance --hostname=$(hostname)