From bf321827b9493dbd01ce286ab7a4944008c12fb2 Mon Sep 17 00:00:00 2001 From: Artur Zarzycki Date: Mon, 7 Nov 2016 16:48:20 +0100 Subject: [PATCH] Move repository address to variable url.ceph_repository Additionally add option for set as variable keyserver and keyid. Change-Id: I0304ce2c5b4f90f83130f7b7959a410d19f8ed32 --- docker/radosgw/Dockerfile.j2 | 5 +++-- docker/radosgw/sources.list.debian | 1 - docker/radosgw/sources.list.debian.j2 | 1 + service/files/defaults.yaml | 4 ++++ 4 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 docker/radosgw/sources.list.debian create mode 100644 docker/radosgw/sources.list.debian.j2 diff --git a/docker/radosgw/Dockerfile.j2 b/docker/radosgw/Dockerfile.j2 index 6e1f776..3bc3c0d 100644 --- a/docker/radosgw/Dockerfile.j2 +++ b/docker/radosgw/Dockerfile.j2 @@ -1,8 +1,9 @@ FROM {{ image_spec("openstack-base") }} MAINTAINER {{ maintainer }} -COPY sources.list.debian /etc/apt/sources.list.d/ceph.list -RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 460F3994 \ +COPY {{ render('sources.list.debian.j2') }} /etc/apt/sources.list.d/ceph.list +RUN apt-key adv --recv-keys --keyserver {{ url.ceph_repository_keyserver }} \ + {{ url.ceph_repository_keyid }} \ && apt-get update \ && apt-get install -y --no-install-recommends radosgw \ && apt-get clean \ diff --git a/docker/radosgw/sources.list.debian b/docker/radosgw/sources.list.debian deleted file mode 100644 index 2fec95f..0000000 --- a/docker/radosgw/sources.list.debian +++ /dev/null @@ -1 +0,0 @@ -deb http://eu.ceph.com/debian-jewel jessie main diff --git a/docker/radosgw/sources.list.debian.j2 b/docker/radosgw/sources.list.debian.j2 new file mode 100644 index 0000000..af08712 --- /dev/null +++ b/docker/radosgw/sources.list.debian.j2 @@ -0,0 +1 @@ +deb {{ url.ceph_repository }} jessie main diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml index ff4d3aa..e34a093 100644 --- a/service/files/defaults.yaml +++ b/service/files/defaults.yaml @@ -6,3 +6,7 @@ configs: port: cont: 7480 key: "Changeme" +url: + ceph_repository: http://eu.ceph.com/debian-jewel + ceph_repository_keyserver: hkp://keyserver.ubuntu.com:80 + ceph_repository_keyid: 460F3994