summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Pavlov <apavlov@mirantis.com>2016-10-19 18:20:26 +0000
committerAndrey Pavlov <apavlov@mirantis.com>2016-10-26 17:32:43 +0000
commita3b8ac92b823fa77dc3b439f720ec5b814e0b2a4 (patch)
treedf38850ca783782a0b2570d36699f75d3f76961f
parent94245cdf863d65e056f6aaf61e69913900988679 (diff)
Ports configuration refactoring
Ports configuration has been changed: before: port: 123:3333 after: port: cont: 123 node: 3333 Change-Id: Ifaf713268cd9044939740fae008981599dbb285b Depends-On: I54ab8dd02fc88b821a1f0d05c08f98b618730150
Notes
Notes (review): Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: Sergey Reshetnyak <sreshetniak@mirantis.com> Code-Review+2: Aleksandr Mogylchenko <amogylchenko@mirantis.com> Workflow+1: Aleksandr Mogylchenko <amogylchenko@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 27 Oct 2016 10:37:46 +0000 Reviewed-on: https://review.openstack.org/388848 Project: openstack/fuel-ccp-rabbitmq Branch: refs/heads/master
-rw-r--r--service/files/defaults.yaml5
-rw-r--r--service/files/rabbitmq.config.j22
-rw-r--r--service/rabbitmq.yaml2
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 @@
1configs: 1configs:
2 rabbitmq: 2 rabbitmq:
3 port: 5672 3 port:
4 external_port: 32672 4 cont: 5672
5 node: 32672
5 password: password 6 password: password
6 user: rabbitmq 7 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 @@
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.cont }} }
5 ]}, 5 ]},
6 {default_user, <<"{{ rabbitmq.user }}">>}, 6 {default_user, <<"{{ rabbitmq.user }}">>},
7 {default_pass, <<"{{ rabbitmq.password }}">>}, 7 {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 @@
1service: 1service:
2 name: rabbitmq 2 name: rabbitmq
3 ports: 3 ports:
4 - "{{ rabbitmq.port }}:{{ rabbitmq.external_port }}" 4 - {{ rabbitmq.port }}
5 containers: 5 containers:
6 - name: rabbitmq 6 - name: rabbitmq
7 image: rabbitmq 7 image: rabbitmq