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

Merge pull request #2523 from ivuk/fix-variable-names

Browse Source 
Update variable names for local Docker daemon installation

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-10-25 17:30:44 +00:00
committed by GitHub
parent afb3c0e31e c133b35162
commit 695c7ade86
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
installer/roles/local_docker/tasks/standalone.yml
View File

@@ -109,8 +109,8 @@
RABBITMQ_VHOST: "{{ rabbitmq_default_vhost }}"
MEMCACHED_HOST: "memcached"
MEMCACHED_PORT: "11211"
AWX_ADMIN_USER: "{{ default_admin_user|default('admin') }}"
AWX_ADMIN_PASSWORD: "{{ default_admin_password|default('password') }}"
AWX_ADMIN_USER: "{{ admin_user|default('admin') }}"
AWX_ADMIN_PASSWORD: "{{ admin_password|default('password') }}"
register: awx_web_container
- name: Update CA trust in awx_web container
@@ -150,5 +150,5 @@
RABBITMQ_VHOST: "{{ rabbitmq_default_vhost }}"
MEMCACHED_HOST: "memcached"
MEMCACHED_PORT: "11211"
AWX_ADMIN_USER: "{{ default_admin_user|default('admin') }}"
AWX_ADMIN_PASSWORD: "{{ default_admin_password|default('password') }}"
AWX_ADMIN_USER: "{{ admin_user|default('admin') }}"
AWX_ADMIN_PASSWORD: "{{ admin_password|default('password') }}"