External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-16 10:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1170 from shanemcd/fix_standalone_docker_wait_fors

Browse Source 
Fix wait_fors in standalone Docker installs
This commit is contained in:
Jake McDermott
2018-02-08 16:08:31 -05:00
committed by GitHub
parent b3dcfc8c18 6b3ca32827
commit 8475bdfdc4
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,8 +6,8 @@ if [ `id -u` -ge 500 ]; then
fi 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=$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=$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=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=$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 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

4
installer/kubernetes/templates/deployment.yml.j2
View File

@@ -36,6 +36,10 @@ spec:
value: ({{ pg_port|default('5432') }}) value: ({{ pg_port|default('5432') }})
- name: DATABASE_PASSWORD - name: DATABASE_PASSWORD
value: {{ pg_password }} value: {{ pg_password }}
- name: MEMCACHED_HOST
value: {{ memcached_hostname|default('localhost') }}
- name: RABBITMQ_HOST
value: {{ rabbitmq_hostname|default('localhost') }}
- name: AWX_ADMIN_USER - name: AWX_ADMIN_USER
value: {{ default_admin_user|default('admin') }} value: {{ default_admin_user|default('admin') }}
- name: AWX_ADMIN_PASSWORD - name: AWX_ADMIN_PASSWORD

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

@@ -36,6 +36,10 @@ spec:
value: ({{ pg_port|default('5432') }}) value: ({{ pg_port|default('5432') }})
- name: DATABASE_PASSWORD - name: DATABASE_PASSWORD
value: {{ pg_password }} value: {{ pg_password }}
- name: MEMCACHED_HOST
value: {{ memcached_hostname|default('localhost') }}
- name: RABBITMQ_HOST
value: {{ rabbitmq_hostname|default('localhost') }}
- name: AWX_ADMIN_USER - name: AWX_ADMIN_USER
value: {{ default_admin_user|default('admin') }} value: {{ default_admin_user|default('admin') }}
- name: AWX_ADMIN_PASSWORD - name: AWX_ADMIN_PASSWORD