Merge "Adjust to per-service configuration"

This commit is contained in:
Jenkins 2017-03-03 13:56:36 +00:00 committed by Gerrit Code Review
commit 91e739fc36
2 changed files with 4 additions and 4 deletions

View File

@ -1,10 +1,11 @@
{% macro rabbit(cfg_type) -%}
{% if cfg_type == 'rpc_config' -%}
[DEFAULT]
[DEFAULT]
transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rpc', rabbitmq.port) }}
{%- elif cfg_type == 'notifications_config' -%}
[oslo_messaging_notifications]
[oslo_messaging_notifications]
transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('notifications', rabbitmq.port) }}
{%- endif %}
transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq', rabbitmq.port) }}
{% if rabbitmq.tls.enabled %}
[oslo_messaging_rabbit]

View File

@ -8,7 +8,6 @@ configs:
rabbitmq:
port:
cont: 5672
node: 32672
password: password
erlang_cookie: erlang_cookie
user: rabbitmq