Merge pull request #4107 from gizero/docker-compose-fix-create_preloa…

…d_data ensure "create_preload_data" is honored in docker-compose deployments
ansible · Nov 12, 2019 · f66f24e · f66f24e
2 parents d3ea09d + 1198c06
commit f66f24e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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/...oles/image_build/files/launch_awx_task.sh → ...age_build/templates/launch_awx_task.sh.j2 b/...oles/image_build/files/launch_awx_task.sh → ...age_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)