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

Merge pull request #2395 from shanemcd/devel

Browse Source 
Fix fallout from #2392

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-10-10 16:29:45 +00:00
committed by GitHub
parent e94e79d57a ee1d5e43b9
commit f9928eef70
4 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
installer/inventory
View File

@@ -82,8 +82,8 @@ rabbitmq_erlang_cookie=cookiemonster
# This will create or update a default admin (superuser) account in AWX, if not provided # This will create or update a default admin (superuser) account in AWX, if not provided
# then these default values are used # then these default values are used
# default_admin_user=admin admin_user=admin
# default_admin_password=password admin_password=password
# AWX Secret key # AWX Secret key
# It's *very* important that this stay the same between upgrades or you will lose the ability to decrypt # It's *very* important that this stay the same between upgrades or you will lose the ability to decrypt

2
installer/roles/image_build/files/launch_awx.sh
View File

@@ -8,7 +8,7 @@ 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=$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=$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 "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 --become-user $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 collectstatic --noinput --clear awx-manage collectstatic --noinput --clear
supervisord -c /supervisor.conf supervisord -c /supervisor.conf

2
installer/roles/kubernetes/defaults/main.yml
View File

@@ -1,4 +1,6 @@
--- ---
dockerhub_version: "{{ lookup('file', playbook_dir + '/../VERSION') }}"
admin_user: 'admin' admin_user: 'admin'
admin_email: 'root@localhost' admin_email: 'root@localhost'
admin_password: '' admin_password: ''

18
installer/roles/kubernetes/templates/deployment.yml.j2
View File

@@ -139,6 +139,24 @@ spec:
- name: "{{ kubernetes_deployment_name }}-confd" - name: "{{ kubernetes_deployment_name }}-confd"
mountPath: "/etc/tower/conf.d/" mountPath: "/etc/tower/conf.d/"
readOnly: true readOnly: true
env:
- name: DATABASE_USER
value: {{ pg_username }}
- name: DATABASE_NAME
value: {{ pg_database }}
- name: DATABASE_HOST
value: {{ pg_hostname|default('postgresql') }}
- name: DATABASE_PORT
value: "{{ pg_port|default('5432') }}"
- name: DATABASE_PASSWORD
valueFrom:
secretKeyRef:
name: "{{ kubernetes_deployment_name }}-secrets"
key: pg_password
- name: MEMCACHED_HOST
value: {{ memcached_hostname|default('localhost') }}
- name: RABBITMQ_HOST
value: {{ rabbitmq_hostname|default('localhost') }}
resources: resources:
requests: requests:
memory: "{{ web_mem_request }}Gi" memory: "{{ web_mem_request }}Gi"