From a3071c2a1f2871ecdda8ddf09f7c0d0229cee63e Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Mon, 4 Dec 2017 11:08:40 -0500 Subject: [PATCH] Make sure we define postgres port customization during install --- installer/image_build/files/launch_awx_task.sh | 2 +- installer/openshift/templates/deployment.yml.j2 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/installer/image_build/files/launch_awx_task.sh b/installer/image_build/files/launch_awx_task.sh index 9879f3cb02..b2e489d069 100755 --- a/installer/image_build/files/launch_awx_task.sh +++ b/installer/image_build/files/launch_awx_task.sh @@ -4,7 +4,7 @@ if [ `id -u` -ge 500 ]; then cat /tmp/passwd > /etc/passwd rm /tmp/passwd fi -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" 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 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 diff --git a/installer/openshift/templates/deployment.yml.j2 b/installer/openshift/templates/deployment.yml.j2 index 783b9c422a..2bdc3652fb 100644 --- a/installer/openshift/templates/deployment.yml.j2 +++ b/installer/openshift/templates/deployment.yml.j2 @@ -32,6 +32,8 @@ spec: value: {{ pg_database }} - name: DATABASE_HOST value: {{ pg_hostname|default('postgresql') }} + - name: DATABASE_PORT + value: {{ pg_port|default('5432') }} - name: DATABASE_PASSWORD value: {{ pg_password }} - name: AWX_ADMIN_USER