summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuriy Taraday <yorik.sar@gmail.com>2016-10-06 13:03:14 +0300
committerYuriy Taraday <yorik.sar@gmail.com>2016-10-06 13:03:14 +0300
commit03cdf01d93af0ecffb582816477fd8b1434cd50c (patch)
treef5edd61b1cf1108623319965c930cb072d426b8a
parent7d633af3ab0fd12fb2608cccf2c2ed959a8fc7c9 (diff)
Convert all RabbitMQ configs to nested
Notes
Notes (review): Code-Review+2: Artur Zarzycki <azarzycki@mirantis.com> Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@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: Thu, 06 Oct 2016 15:59:21 +0000 Reviewed-on: https://review.openstack.org/382894 Project: openstack/fuel-ccp-rabbitmq Branch: refs/heads/master
-rw-r--r--service/files/defaults.yaml7
-rw-r--r--service/files/erlang.cookie2
-rw-r--r--service/files/rabbitmq.config.j26
-rw-r--r--service/rabbitmq.yaml2
4 files changed, 9 insertions, 8 deletions
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index b555f81..3d5c864 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -1,4 +1,5 @@
1configs: 1configs:
2 rabbitmq_port: 5672 2 rabbitmq:
3 rabbitmq_password: password 3 port: 5672
4 rabbitmq_user: rabbitmq 4 password: password
5 user: rabbitmq
diff --git a/service/files/erlang.cookie b/service/files/erlang.cookie
index 5dc245f..0dc3c1c 100644
--- a/service/files/erlang.cookie
+++ b/service/files/erlang.cookie
@@ -1 +1 @@
{{ rabbitmq_password }} {{ rabbitmq.password }}
diff --git a/service/files/rabbitmq.config.j2 b/service/files/rabbitmq.config.j2
index b166f6c..cc370bb 100644
--- a/service/files/rabbitmq.config.j2
+++ b/service/files/rabbitmq.config.j2
@@ -1,10 +1,10 @@
1[ 1[
2 {rabbit, [ 2 {rabbit, [
3 {tcp_listeners, [ 3 {tcp_listeners, [
4 {"0.0.0.0", {{ rabbitmq_port }} } 4 {"0.0.0.0", {{ rabbitmq.port }} }
5 ]}, 5 ]},
6 {default_user, <<"{{ rabbitmq_user }}">>}, 6 {default_user, <<"{{ rabbitmq.user }}">>},
7 {default_pass, <<"{{ rabbitmq_password }}">>}, 7 {default_pass, <<"{{ rabbitmq.password }}">>},
8 {cluster_partition_handling, autoheal} 8 {cluster_partition_handling, autoheal}
9 ]} 9 ]}
10]. 10].
diff --git a/service/rabbitmq.yaml b/service/rabbitmq.yaml
index 010165e..a447a9c 100644
--- a/service/rabbitmq.yaml
+++ b/service/rabbitmq.yaml
@@ -1,7 +1,7 @@
1service: 1service:
2 name: rabbitmq 2 name: rabbitmq
3 ports: 3 ports:
4 - {{ rabbitmq_port }} 4 - {{ rabbitmq.port }}
5 containers: 5 containers:
6 - name: rabbitmq 6 - name: rabbitmq
7 image: rabbitmq 7 image: rabbitmq