External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 04:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Consistent naming scheme; rabbitmq_host -> rabbitmq_hostname

Browse Source 
environment.sh uses hostname for everything, and both environment and
credentials provide a default of 'rabbitmq', so this should be one less
variable to care about.
This commit is contained in:
Erik Berg
2019-11-18 13:46:43 +00:00
parent b88f4ce27c
commit 91c78d7137
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ rabbitmq_version: "3.7.4"
rabbitmq_image: "ansible/awx_rabbitmq:{{rabbitmq_version}}" rabbitmq_image: "ansible/awx_rabbitmq:{{rabbitmq_version}}"
rabbitmq_default_vhost: "awx" rabbitmq_default_vhost: "awx"
rabbitmq_erlang_cookie: "cookiemonster" rabbitmq_erlang_cookie: "cookiemonster"
rabbitmq_host: "rabbitmq" rabbitmq_hostname: "rabbitmq"
rabbitmq_port: "5672" rabbitmq_port: "5672"
rabbitmq_user: "guest" rabbitmq_user: "guest"
rabbitmq_password: "guest" rabbitmq_password: "guest"

2
installer/roles/local_docker/templates/credentials.py.j2
View File

@@ -13,7 +13,7 @@ DATABASES = {
BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format( BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format(
"{{ rabbitmq_user }}", "{{ rabbitmq_user }}",
"{{ rabbitmq_password }}", "{{ rabbitmq_password }}",
"{{ rabbitmq_host | default('rabbitmq')}}", "{{ rabbitmq_hostname | default('rabbitmq')}}",
"{{ rabbitmq_port }}", "{{ rabbitmq_port }}",
"{{ rabbitmq_default_vhost }}") "{{ rabbitmq_default_vhost }}")