mirror of
https://github.com/ansible/awx.git
synced 2024-10-30 22:21:13 +03:00
Merge pull request #2523 from ivuk/fix-variable-names
Update variable names for local Docker daemon installation Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
commit
695c7ade86
@ -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') }}"
|
||||
|
Loading…
Reference in New Issue
Block a user