Move repository address to variable url.ceph.debian.repo

Additionally add option to set as variable keyserver and keyid.

Depends-On: I0304ce2c5b4f90f83130f7b7959a410d19f8ed32

Change-Id: Iccf808fde243e97c6598d360ee1e1f6de8f9056c
This commit is contained in:
Artur Zarzycki 2016-11-07 16:51:18 +01:00
parent 48f7f29c5b
commit f0981e0b28
3 changed files with 4 additions and 4 deletions

View File

@ -1,12 +1,12 @@
FROM {{ image_spec("openstack-base") }}
MAINTAINER {{ maintainer }}
COPY sources.list.debian /etc/apt/sources.list.d/ceph.list
COPY {{ render('sources.list.debian.j2') }} /etc/apt/sources.list.d/ceph.list
{{ copy_sources("openstack/glance", "/glance") }}
RUN useradd --user-group glance \
&& apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 460F3994 \
&& apt-key adv --recv-keys --keyserver {{ url.ceph.debian.keyserver }} \
{{ url.ceph.debian.keyid }} \
&& /var/lib/microservices/venv/bin/pip install --upgrade /glance \
&& mkdir -p /var/lib/glance /etc/glance \
&& cp -r /glance/etc/* /etc/glance \

View File

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

View File

@ -0,0 +1 @@
deb {{ url.ceph.debian.repo }} jessie main