summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-27 13:24:39 +0000
committerGerrit Code Review <review@openstack.org>2016-12-27 13:24:39 +0000
commit30fdd98681a218cc25862f7ddad8a6fe1c6c49a4 (patch)
treed3a28353a88f4daf2747b14a6d78dfb1c0fd5939
parentc4cdedef841be731b757ecaa84a9c10b65b552ca (diff)
parent8be506e3e0b1a580160d79bc786392f9952ea6a9 (diff)
Merge "Messaging multi-backend support"
-rw-r--r--exports/oslo_messaging.j28
-rw-r--r--service/files/defaults.yaml6
2 files changed, 14 insertions, 0 deletions
diff --git a/exports/oslo_messaging.j2 b/exports/oslo_messaging.j2
new file mode 100644
index 0000000..fa869b3
--- /dev/null
+++ b/exports/oslo_messaging.j2
@@ -0,0 +1,8 @@
1{% macro rabbit(cfg_type) -%}
2{% if cfg_type == 'rpc_config' -%}
3 [DEFAULT]
4{%- elif cfg_type == 'notifications_config' -%}
5 [oslo_messaging_notifications]
6{%- endif %}
7transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq') }}
8{%- endmacro %}
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 1495def..209b8d3 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -1,4 +1,10 @@
1configs: 1configs:
2 messaging:
3 backend:
4 rpc: rabbit
5 notifications: rabbit
6 dependencies:
7 rabbit: rabbitmq
2 rabbitmq: 8 rabbitmq:
3 port: 9 port:
4 cont: 5672 10 cont: 5672