Merge pull request #5339 from eb4x/rabbitmq_hostname

Consistent naming scheme; rabbitmq_host -> rabbitmq_hostname

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-11-18 14:38:25 +00:00 committed by GitHub
commit a1f7f967e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

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

View File

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