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

docker/glance-base/Dockerfile.j2

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

docker/glance-base/sources.list.debian

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

docker/glance-base/sources.list.debian.j2

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