From a3b8ac92b823fa77dc3b439f720ec5b814e0b2a4 Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Wed, 19 Oct 2016 18:20:26 +0000 Subject: [PATCH] Ports configuration refactoring Ports configuration has been changed: before: port: 123:3333 after: port: cont: 123 node: 3333 Change-Id: Ifaf713268cd9044939740fae008981599dbb285b Depends-On: I54ab8dd02fc88b821a1f0d05c08f98b618730150 --- service/files/defaults.yaml | 5 +++-- service/files/rabbitmq.config.j2 | 2 +- service/rabbitmq.yaml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml index f0af5a6..481b969 100644 --- a/service/files/defaults.yaml +++ b/service/files/defaults.yaml @@ -1,6 +1,7 @@ configs: rabbitmq: - port: 5672 - external_port: 32672 + port: + cont: 5672 + node: 32672 password: password user: rabbitmq diff --git a/service/files/rabbitmq.config.j2 b/service/files/rabbitmq.config.j2 index cc370bb..97b5252 100644 --- a/service/files/rabbitmq.config.j2 +++ b/service/files/rabbitmq.config.j2 @@ -1,7 +1,7 @@ [ {rabbit, [ {tcp_listeners, [ - {"0.0.0.0", {{ rabbitmq.port }} } + {"0.0.0.0", {{ rabbitmq.port.cont }} } ]}, {default_user, <<"{{ rabbitmq.user }}">>}, {default_pass, <<"{{ rabbitmq.password }}">>}, diff --git a/service/rabbitmq.yaml b/service/rabbitmq.yaml index 31c7f31..94b1fdc 100644 --- a/service/rabbitmq.yaml +++ b/service/rabbitmq.yaml @@ -1,7 +1,7 @@ service: name: rabbitmq ports: - - "{{ rabbitmq.port }}:{{ rabbitmq.external_port }}" + - {{ rabbitmq.port }} containers: - name: rabbitmq image: rabbitmq