summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-03 13:56:36 +0000
committerGerrit Code Review <review@openstack.org>2017-03-03 13:56:36 +0000
commit91e739fc36ad1fc772caaeafef03064d9db49e48 (patch)
tree8ccd052701c4b6a1a3c14bc59b018d271ed5b6ab
parent0d02edf6327c9bd0bb2a9b02897c12a546264277 (diff)
parent4727243d0639f77e254d0b5ac57f84c6cea327cf (diff)
Merge "Adjust to per-service configuration"
-rw-r--r--exports/oslo_messaging.j27
-rw-r--r--service/files/defaults.yaml1
2 files changed, 4 insertions, 4 deletions
diff --git a/exports/oslo_messaging.j2 b/exports/oslo_messaging.j2
index 0ff4aff..04afd3b 100644
--- a/exports/oslo_messaging.j2
+++ b/exports/oslo_messaging.j2
@@ -1,10 +1,11 @@
1{% macro rabbit(cfg_type) -%} 1{% macro rabbit(cfg_type) -%}
2{% if cfg_type == 'rpc_config' -%} 2{% if cfg_type == 'rpc_config' -%}
3 [DEFAULT] 3[DEFAULT]
4transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rpc', rabbitmq.port) }}
4{%- elif cfg_type == 'notifications_config' -%} 5{%- elif cfg_type == 'notifications_config' -%}
5 [oslo_messaging_notifications] 6[oslo_messaging_notifications]
7transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('notifications', rabbitmq.port) }}
6{%- endif %} 8{%- endif %}
7transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq', rabbitmq.port) }}
8 9
9{% if rabbitmq.tls.enabled %} 10{% if rabbitmq.tls.enabled %}
10[oslo_messaging_rabbit] 11[oslo_messaging_rabbit]
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index fc66527..4b1e725 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -8,7 +8,6 @@ configs:
8 rabbitmq: 8 rabbitmq:
9 port: 9 port:
10 cont: 5672 10 cont: 5672
11 node: 32672
12 password: password 11 password: password
13 erlang_cookie: erlang_cookie 12 erlang_cookie: erlang_cookie
14 user: rabbitmq 13 user: rabbitmq