From 6d60e7dadc1efd0e1e5f263a8cfc1377f57cdaa4 Mon Sep 17 00:00:00 2001 From: chris meyers Date: Thu, 2 Apr 2020 09:49:35 -0400 Subject: [PATCH] align with openshift --- installer/roles/kubernetes/templates/deployment.yml.j2 | 6 +++--- installer/roles/kubernetes/templates/launch_awx.yml.j2 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2 index 8f0ef43e56..ab2731274e 100644 --- a/installer/roles/kubernetes/templates/deployment.yml.j2 +++ b/installer/roles/kubernetes/templates/deployment.yml.j2 @@ -121,7 +121,7 @@ spec: - name: "{{ kubernetes_deployment_name }}-application-credentials" mountPath: "/etc/tower/conf.d/" readOnly: true - + - name: {{ kubernetes_deployment_name }}-launch-awx-web mountPath: "/usr/bin/launch_awx.sh" subPath: "launch_awx.sh" @@ -188,7 +188,7 @@ spec: - name: "{{ kubernetes_deployment_name }}-application-credentials" mountPath: "/etc/tower/conf.d/" readOnly: true - + - name: {{ kubernetes_deployment_name }}-launch-awx-web mountPath: "/usr/bin/launch_awx.sh" subPath: "launch_awx.sh" @@ -343,7 +343,7 @@ spec: path: 'credentials.py' - key: environment_sh path: 'environment.sh' - + - name: {{ kubernetes_deployment_name }}-launch-awx-web configMap: name: {{ kubernetes_deployment_name }}-launch-awx diff --git a/installer/roles/kubernetes/templates/launch_awx.yml.j2 b/installer/roles/kubernetes/templates/launch_awx.yml.j2 index 46b3b7a16b..3715bd5bfc 100644 --- a/installer/roles/kubernetes/templates/launch_awx.yml.j2 +++ b/installer/roles/kubernetes/templates/launch_awx.yml.j2 @@ -16,7 +16,7 @@ data: 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=$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 wait_for -a "path=/var/run/redis/redis.sock" all if [ -z "$AWX_SKIP_MIGRATIONS" ]; then @@ -50,7 +50,7 @@ data: 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=$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 wait_for -a "path=/var/run/redis/redis.sock" all awx-manage collectstatic --noinput --clear