External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-25 06:56:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Make sure we define postgres port customization during install

Browse Source
This commit is contained in:
Matthew Jones
2017-12-04 11:08:40 -05:00
parent cf0cc2e2f2
commit a3071c2a1f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/image_build/files/launch_awx_task.sh
View File

@@ -4,7 +4,7 @@ if [ `id -u` -ge 500 ]; then
cat /tmp/passwd > /etc/passwd cat /tmp/passwd > /etc/passwd
rm /tmp/passwd rm /tmp/passwd
fi 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 awx-manage migrate --noinput --fake-initial
if [ ! -z "$AWX_ADMIN_USER" ]&&[ ! -z "$AWX_ADMIN_PASSWORD" ]; then 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 echo "from django.contrib.auth.models import User; User.objects.create_superuser('$AWX_ADMIN_USER', 'root@localhost', '$AWX_ADMIN_PASSWORD')" | awx-manage shell

2
installer/openshift/templates/deployment.yml.j2
View File

@@ -32,6 +32,8 @@ spec:
value: {{ pg_database }} value: {{ pg_database }}
- name: DATABASE_HOST - name: DATABASE_HOST
value: {{ pg_hostname|default('postgresql') }} value: {{ pg_hostname|default('postgresql') }}
- name: DATABASE_PORT
value: {{ pg_port|default('5432') }}
- name: DATABASE_PASSWORD - name: DATABASE_PASSWORD
value: {{ pg_password }} value: {{ pg_password }}
- name: AWX_ADMIN_USER - name: AWX_ADMIN_USER