summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorProskurin Kirill <kproskurin@mirantis.com>2016-08-18 18:29:23 +0300
committerProskurin Kirill <kproskurin@mirantis.com>2016-08-18 18:29:42 +0300
commitfdd408db48ba0af0b8d8d00518187d1d5c5f78a8 (patch)
treeb54dab9e11403e91cd6409ef17c16a0be0d0fe31
parent6e082e06e549f3ad7bd4983875d902a1d920186c (diff)
Remove variables for rbmq volume
Notes
Notes (review): Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: Sergey Reshetnyak <sreshetniak@mirantis.com> Code-Review-1: Bogdan Dobrelya <bdobrelia@mirantis.com> Code-Review+2: Eric Lemoine <elemoine@mirantis.com> Workflow+1: Eric Lemoine <elemoine@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 18 Aug 2016 17:09:21 +0000 Reviewed-on: https://review.openstack.org/357304 Project: openstack/fuel-ccp-rabbitmq Branch: refs/heads/master
-rw-r--r--service/files/defaults.yaml1
-rw-r--r--service/files/rabbitmq-env.conf.j22
-rw-r--r--service/rabbitmq.yaml4
3 files changed, 3 insertions, 4 deletions
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 07de8a1..b555f81 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -2,4 +2,3 @@ configs:
2 rabbitmq_port: 5672 2 rabbitmq_port: 5672
3 rabbitmq_password: password 3 rabbitmq_password: password
4 rabbitmq_user: rabbitmq 4 rabbitmq_user: rabbitmq
5 rabbitmq_log_base: /var/log/ccp/rabbitmq
diff --git a/service/files/rabbitmq-env.conf.j2 b/service/files/rabbitmq-env.conf.j2
index 3cd0991..6f28389 100644
--- a/service/files/rabbitmq-env.conf.j2
+++ b/service/files/rabbitmq-env.conf.j2
@@ -1,2 +1,2 @@
1NODENAME=rabbitmq 1NODENAME=rabbitmq
2RABBITMQ_LOG_BASE={{ rabbitmq_log_base }} 2RABBITMQ_LOG_BASE=/var/log/ccp/rabbitmq
diff --git a/service/rabbitmq.yaml b/service/rabbitmq.yaml
index 377ac51..0317be6 100644
--- a/service/rabbitmq.yaml
+++ b/service/rabbitmq.yaml
@@ -10,12 +10,12 @@ service:
10 liveness: "true" 10 liveness: "true"
11 volumes: 11 volumes:
12 - name: rabbitmq-logs 12 - name: rabbitmq-logs
13 path: "{{ rabbitmq_log_base }}" 13 path: "/var/log/ccp/rabbitmq"
14 type: host 14 type: host
15 readOnly: False 15 readOnly: False
16 pre: 16 pre:
17 - name: chown-logs-dir 17 - name: chown-logs-dir
18 command: "sudo /bin/chown rabbitmq: {{ rabbitmq_log_base }}" 18 command: "sudo /bin/chown rabbitmq: /var/log/ccp/rabbitmq"
19 daemon: 19 daemon:
20 files: 20 files:
21 - rabbitmq-conf 21 - rabbitmq-conf