x
/
fuel-ccp-nova
Code Issues Proposed changes

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
This commit is contained in:
Artur Zarzycki 2016-11-07 16:52:15 +01:00
parent 3820c9803e
commit bafb448444
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/nova-base/Dockerfile.j2
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.debian.keyserver }} \
{{ url.ceph.debian.keyid }} \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
bridge-utils \

1
docker/nova-base/sources.list.debian
View File

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

1
docker/nova-base/sources.list.debian.j2 Normal file
View File

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