From 6b3ca32827a24bbe0b5fedea9647f3fd5e964730 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Thu, 8 Feb 2018 15:08:26 -0500 Subject: [PATCH] Fix wait_fors in standalone Docker installs --- installer/image_build/files/launch_awx_task.sh | 4 ++-- installer/kubernetes/templates/deployment.yml.j2 | 4 ++++ installer/openshift/templates/deployment.yml.j2 | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/installer/image_build/files/launch_awx_task.sh b/installer/image_build/files/launch_awx_task.sh index ebcc8b6798..395622ac53 100755 --- a/installer/image_build/files/launch_awx_task.sh +++ b/installer/image_build/files/launch_awx_task.sh @@ -6,8 +6,8 @@ if [ `id -u` -ge 500 ]; then fi ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=$DATABASE_HOST port=$DATABASE_PORT" all -ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=localhost port=11211" all -ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=localhost port=5672" all +ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=$MEMCACHED_HOST port=11211" all +ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=$RABBITMQ_HOST port=5672" all ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m postgresql_db -U $DATABASE_USER -a "name=$DATABASE_NAME owner=$DATABASE_USER login_user=$DATABASE_USER login_host=$DATABASE_HOST login_password=$DATABASE_PASSWORD port=$DATABASE_PORT" all awx-manage migrate --noinput --fake-initial diff --git a/installer/kubernetes/templates/deployment.yml.j2 b/installer/kubernetes/templates/deployment.yml.j2 index 318723181b..16c86e6227 100644 --- a/installer/kubernetes/templates/deployment.yml.j2 +++ b/installer/kubernetes/templates/deployment.yml.j2 @@ -36,6 +36,10 @@ spec: value: ({{ pg_port|default('5432') }}) - name: DATABASE_PASSWORD value: {{ pg_password }} + - name: MEMCACHED_HOST + value: {{ memcached_hostname|default('localhost') }} + - name: RABBITMQ_HOST + value: {{ rabbitmq_hostname|default('localhost') }} - name: AWX_ADMIN_USER value: {{ default_admin_user|default('admin') }} - name: AWX_ADMIN_PASSWORD diff --git a/installer/openshift/templates/deployment.yml.j2 b/installer/openshift/templates/deployment.yml.j2 index eddd193938..2f247d8f56 100644 --- a/installer/openshift/templates/deployment.yml.j2 +++ b/installer/openshift/templates/deployment.yml.j2 @@ -36,6 +36,10 @@ spec: value: ({{ pg_port|default('5432') }}) - name: DATABASE_PASSWORD value: {{ pg_password }} + - name: MEMCACHED_HOST + value: {{ memcached_hostname|default('localhost') }} + - name: RABBITMQ_HOST + value: {{ rabbitmq_hostname|default('localhost') }} - name: AWX_ADMIN_USER value: {{ default_admin_user|default('admin') }} - name: AWX_ADMIN_PASSWORD