From bafb448444941e7e2313c4b364342ef0a3770ae9 Mon Sep 17 00:00:00 2001 From: Artur Zarzycki Date: Mon, 7 Nov 2016 16:52:15 +0100 Subject: [PATCH] Move repository address to variable url.ceph.debian.repo Additionally add option to set as variable keyserver and keyid. Depends-On: I0304ce2c5b4f90f83130f7b7959a410d19f8ed32 Change-Id: I327a52cf332fc23b8272f8a7056b4939ba37f513 --- docker/nova-base/Dockerfile.j2 | 5 +++-- docker/nova-base/sources.list.debian | 1 - docker/nova-base/sources.list.debian.j2 | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 docker/nova-base/sources.list.debian create mode 100644 docker/nova-base/sources.list.debian.j2 diff --git a/docker/nova-base/Dockerfile.j2 b/docker/nova-base/Dockerfile.j2 index 2ce09c4..ecdfbb4 100644 --- a/docker/nova-base/Dockerfile.j2 +++ b/docker/nova-base/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.debian.keyserver }} \ + {{ url.ceph.debian.keyid }} \ && apt-get update \ && apt-get install -y --no-install-recommends \ bridge-utils \ diff --git a/docker/nova-base/sources.list.debian b/docker/nova-base/sources.list.debian deleted file mode 100644 index 017f3ba..0000000 --- a/docker/nova-base/sources.list.debian +++ /dev/null @@ -1 +0,0 @@ -deb http://download.ceph.com/debian-jewel jessie main diff --git a/docker/nova-base/sources.list.debian.j2 b/docker/nova-base/sources.list.debian.j2 new file mode 100644 index 0000000..b3bb799 --- /dev/null +++ b/docker/nova-base/sources.list.debian.j2 @@ -0,0 +1 @@ +deb {{ url.ceph.debian.repo }} jessie main