summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2016-07-08 09:21:19 -0700
committerClark Boylan <clark.boylan@gmail.com>2016-07-14 12:00:10 -0700
commitfec528cdb030434f4d3f75d73719b161a45c5c12 (patch)
treea29cd39d6e434dd66f6e4b9d9baf46f6a69cd010 /devstack
parentccd9d3d792505fb8be8b239d6b7ffddb1683c0c9 (diff)
Use opt in package repo mirror in gate
OpenStack CI would prefer to not have the ceph repo package mirror enabled by default for all jobs. Instead the mirror config will be provided in a directory that apt won't read and can by copied/linked into the dir that apt will read. This gives testing greater flexibility and prevents growing dependencies on non standard repos in jobs that don't intend on growing those dependencies. Change-Id: Icd87013fa74601268c19a8b79abf6b7baeaca9db Depends-On: I410f45064080e1bb93684899028e9af34bd555a1
Notes
Notes (review): Code-Review+1: melanie witt <melwittt@gmail.com> Code-Review+1: Andreas Jaeger <jaegerandi@gmail.com> Code-Review+2: Jon Bernard <jbernard@tuxion.com> Workflow+1: Jon Bernard <jbernard@tuxion.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Sat, 16 Jul 2016 00:24:06 +0000 Reviewed-on: https://review.openstack.org/339690 Project: openstack/devstack-plugin-ceph Branch: refs/heads/master
Diffstat (limited to 'devstack')
-rw-r--r--devstack/lib/ceph17
1 files changed, 14 insertions, 3 deletions
diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index 975af5a..8284b98 100644
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -104,8 +104,11 @@ REMOTE_CEPH_RGW=$(trueorfalse False REMOTE_CEPH_RGW)
104# bug 1463525. 104# bug 1463525.
105ATTACH_ENCRYPTED_VOLUME_AVAILABLE=False 105ATTACH_ENCRYPTED_VOLUME_AVAILABLE=False
106 106
107# The gate will configure a package mirror for ceph packages 107# OpenStack CI test instances will have a set of opt in package mirrors in
108APT_REPOSITORY_FILE="/etc/apt/sources.list.d/ceph-deb-hammer.list" 108# /etc/apt/sources.list.available.d/ which will include the ceph package
109# mirror. If this file exists we can link to it in /etc/apt/sources.list.d/
110# to enable it.
111APT_REPOSITORY_FILE="/etc/apt/sources.list.available.d/ceph-deb-hammer.list"
109# If the package mirror file doesn't exist, fetch from here 112# If the package mirror file doesn't exist, fetch from here
110APT_REPOSITORY_ENTRY="\ 113APT_REPOSITORY_ENTRY="\
111 deb http://ceph.com/debian-${CEPH_RELEASE} $(lsb_release -sc) main" 114 deb http://ceph.com/debian-${CEPH_RELEASE} $(lsb_release -sc) main"
@@ -692,7 +695,15 @@ function install_ceph {
692 695
693 CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs1" 696 CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs1"
694 697
695 elif [ ! -f "$APT_REPOSITORY_FILE" ]; then 698 elif [ -f "$APT_REPOSITORY_FILE" ]; then
699 # Opt into Openstack CI provided package repo mirror
700 if [ -f "/etc/apt/sources.list.d/$(basename $APT_REPOSITORY_FILE)" ] ; then
701 # This case can be removed once the CI images are updated to
702 # remove this file.
703 sudo rm "/etc/apt/sources.list.d/$(basename $APT_REPOSITORY_FILE)"
704 fi
705 sudo ln -s $APT_REPOSITORY_FILE "/etc/apt/sources.list.d/$(basename $APT_REPOSITORY_FILE)"
706 else
696 707
697 # the gate requires that we use mirrored package repositories for 708 # the gate requires that we use mirrored package repositories for
698 # reliability, so the most recent ceph packages are mirrored and 709 # reliability, so the most recent ceph packages are mirrored and