Move ceph repo options to nested

Change-Id: I8444a5468b48675d84c9069207fe49b98cce89c0
This commit is contained in:
Artur Zarzycki 2016-11-14 12:11:03 +01:00
parent bf321827b9
commit 2a3f47e1aa
3 changed files with 8 additions and 6 deletions

View File

@ -2,8 +2,8 @@ FROM {{ image_spec("openstack-base") }}
MAINTAINER {{ maintainer }}
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 }} \
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 radosgw \
&& apt-get clean \

View File

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

View File

@ -7,6 +7,8 @@ configs:
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
ceph:
debian:
repo: http://eu.ceph.com/debian-jewel
keyserver: hkp://keyserver.ubuntu.com:80
keyid: 460F3994