summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Pavlov <apavlov@mirantis.com>2017-02-27 12:52:45 +0000
committerAndrey Pavlov <apavlov@mirantis.com>2017-02-28 11:47:15 +0000
commit4727243d0639f77e254d0b5ac57f84c6cea327cf (patch)
tree305081b5e99ec3300edc99b6565661cb92cd6cc7
parent9e2ceb08ad6408e609fc4f3bcf6a7fcdc16dadf0 (diff)
Adjust to per-service configuration
Notes
Notes (review): Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: Sergey Reshetnyak <sreshetniak@mirantis.com> Code-Review+2: Proskurin Kirill <kproskurin@mirantis.com> Workflow+1: Proskurin Kirill <kproskurin@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 03 Mar 2017 13:56:36 +0000 Reviewed-on: https://review.openstack.org/438479 Project: openstack/fuel-ccp-rabbitmq Branch: refs/heads/master
-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 74261c6..f7a1ee2 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