Adjust to per-service configuration

Change-Id: I280d2737472e3f1c195d572f8d1c353c18c32598
Depends-On: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
This commit is contained in:
Andrey Pavlov 2017-02-27 12:52:45 +00:00
parent 9e2ceb08ad
commit 4727243d06
2 changed files with 4 additions and 4 deletions

View File

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

View File

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