Browse Source

Adjust to per-service configuration

Change-Id: I280d2737472e3f1c195d572f8d1c353c18c32598
Depends-On: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
Andrey Pavlov 2 years ago
parent
commit
4727243d06
2 changed files with 4 additions and 4 deletions
  1. 4
    3
      exports/oslo_messaging.j2
  2. 0
    1
      service/files/defaults.yaml

+ 4
- 3
exports/oslo_messaging.j2 View File

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

+ 0
- 1
service/files/defaults.yaml View File

@@ -8,7 +8,6 @@ configs:
8 8
   rabbitmq:
9 9
     port:
10 10
       cont: 5672
11
-      node: 32672
12 11
     password: password
13 12
     erlang_cookie: erlang_cookie
14 13
     user: rabbitmq

Loading…
Cancel
Save