Move repository address to variable url.ceph_repository

Additionally add option for set as variable keyserver and keyid.

Change-Id: I0304ce2c5b4f90f83130f7b7959a410d19f8ed32
This commit is contained in:
Artur Zarzycki 2016-11-07 16:48:20 +01:00
parent 6eab5c9b18
commit bf321827b9
4 changed files with 8 additions and 3 deletions

View File

@ -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 \

View File

@ -1 +0,0 @@
deb http://eu.ceph.com/debian-jewel jessie main

View File

@ -0,0 +1 @@
deb {{ url.ceph_repository }} jessie main

View File

@ -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