summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandr Mogylchenko <amogylchenko@mirantis.com>2016-12-06 19:14:30 +0100
committerAleksandr Mogylchenko <amogylchenko@mirantis.com>2016-12-06 19:14:30 +0100
commitc4cdedef841be731b757ecaa84a9c10b65b552ca (patch)
tree994c7b0aaf608b6e0b634d0837dc98daaf3232b9
parent0d75b55c674b6ef803b5af0fc65c4681fe4aa224 (diff)
Allow custom repositories for RabbitMQ container
With this change one will be able to set custom RabbitMQ repository and its key, as well as specify custom autocluster location (latter seems ugly, but unfortunately no repository for autocluster yet). Change-Id: Ib3d6536d8c9fe8b8d7c5d13d4481772b66cc9db0
Notes
Notes (review): Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: Proskurin Kirill <kproskurin@mirantis.com> Code-Review+2: Artur Zarzycki <azarzycki@mirantis.com> Workflow+1: Artur Zarzycki <azarzycki@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 07 Dec 2016 12:57:36 +0000 Reviewed-on: https://review.openstack.org/407636 Project: openstack/fuel-ccp-rabbitmq Branch: refs/heads/master
-rw-r--r--docker/rabbitmq/Dockerfile.j211
-rw-r--r--docker/rabbitmq/sources.list.debian.j22
-rw-r--r--service/files/defaults.yaml13
3 files changed, 22 insertions, 4 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index dcea56c..e5dfb41 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -14,12 +14,15 @@ RUN apt-get install -t jessie-backports -y --no-install-recommends \
14 && apt-get clean 14 && apt-get clean
15 15
16# We need at least 3.6.6, as it'll contain https://github.com/rabbitmq/rabbitmq-server/pull/892 16# We need at least 3.6.6, as it'll contain https://github.com/rabbitmq/rabbitmq-server/pull/892
17RUN curl -Lo /tmp/rabbitmq-server.deb https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_6_6/rabbitmq-server_3.6.6-1_all.deb \ 17COPY {{ render('sources.list.debian.j2') }} /etc/apt/sources.list.d/rabbitmq.list
18 && dpkg -i /tmp/rabbitmq-server.deb \ 18RUN apt-key adv --recv-keys --keyserver {{ url.rabbitmq.debian.keyserver }} \
19 && rm -rf /tmp/rabbitmq-server.deb /var/lib/rabbitmq/* 19 {{ url.rabbitmq.debian.keyid }} \
20 && apt-get update \
21 && apt-get install -y rabbitmq-server={{ rabbitmq_version }} \
22 && rm -rf /var/lib/rabbitmq/*
20 23
21# `cp` is needed until https://github.com/rabbitmq/rabbitmq-server/pull/1016 is merged 24# `cp` is needed until https://github.com/rabbitmq/rabbitmq-server/pull/1016 is merged
22RUN curl -Lo /tmp/rabbitmq-autocluster.deb https://github.com/Mirantis/rabbitmq-autocluster/releases/download/0.6.1.950/rabbitmq-autocluster_0.6.1.950-1_all.deb \ 25RUN curl -Lo /tmp/rabbitmq-autocluster.deb {{ url.autocluster.provider }}/rabbitmq-autocluster_{{ autocluster_version }}_all.deb \
23 && dpkg -i /tmp/rabbitmq-autocluster.deb \ 26 && dpkg -i /tmp/rabbitmq-autocluster.deb \
24 && cp -v /usr/lib/rabbitmq/plugins/*.ez /usr/lib/rabbitmq/lib/rabbitmq_server-*/plugins/ 27 && cp -v /usr/lib/rabbitmq/plugins/*.ez /usr/lib/rabbitmq/lib/rabbitmq_server-*/plugins/
25 28
diff --git a/docker/rabbitmq/sources.list.debian.j2 b/docker/rabbitmq/sources.list.debian.j2
new file mode 100644
index 0000000..d782798
--- /dev/null
+++ b/docker/rabbitmq/sources.list.debian.j2
@@ -0,0 +1,2 @@
1# Rabbitmq repo
2deb {{ url.rabbitmq.debian.repo }} testing main
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index be9e755..1495def 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -10,3 +10,16 @@ configs:
10 # How many seconds we give a node before making liveness checks 10 # How many seconds we give a node before making liveness checks
11 # completely strict 11 # completely strict
12 node_startup_timeout: 180 12 node_startup_timeout: 180
13
14url:
15 rabbitmq:
16 debian:
17 repo: http://www.rabbitmq.com/debian/
18 keyserver: hkps.pool.sks-keyservers.net
19 keyid: 6B73A36E6026DFCA
20 autocluster:
21 provider: https://github.com/Mirantis/rabbitmq-autocluster/releases/download/0.6.1.950
22
23versions:
24 rabbitmq_version: "3.6.6-1"
25 autocluster_version: "0.6.1.950-1"