From 03cdf01d93af0ecffb582816477fd8b1434cd50c Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Thu, 6 Oct 2016 13:03:14 +0300 Subject: [PATCH] Convert all RabbitMQ configs to nested Change-Id: Ifd74ff24545a4d1019a4918b403b7b7b36237208 --- service/files/defaults.yaml | 7 ++++--- service/files/erlang.cookie | 2 +- service/files/rabbitmq.config.j2 | 6 +++--- service/rabbitmq.yaml | 2 +- 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 @@ configs: - rabbitmq_port: 5672 - rabbitmq_password: password - rabbitmq_user: rabbitmq + rabbitmq: + port: 5672 + password: password + 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 @@ [ {rabbit, [ {tcp_listeners, [ - {"0.0.0.0", {{ rabbitmq_port }} } + {"0.0.0.0", {{ rabbitmq.port }} } ]}, - {default_user, <<"{{ rabbitmq_user }}">>}, - {default_pass, <<"{{ rabbitmq_password }}">>}, + {default_user, <<"{{ rabbitmq.user }}">>}, + {default_pass, <<"{{ rabbitmq.password }}">>}, {cluster_partition_handling, autoheal} ]} ]. 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 @@ service: name: rabbitmq ports: - - {{ rabbitmq_port }} + - {{ rabbitmq.port }} containers: - name: rabbitmq image: rabbitmq