summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorRamana Raja <rraja@redhat.com>2017-02-27 11:46:26 +0530
committerRamana Raja <rraja@redhat.com>2017-03-01 12:27:51 +0530
commit6d01a64e1d106e45cf202379dcbb02ead647c55c (patch)
tree0fa8b37c8afa1a4d74938b9cba9d20d207d0829e /devstack
parent9c59965cd65f721e85ee2a87679d3008f6734959 (diff)
manila: install Jenkins built Ceph packages
For manila-CephFS CI, latest Jewel Ceph packages built using gitbuilder were installed. Jenkins based Ceph build system is going to replace the gitbuilder based build system. Switch to using packages built by the newer system. Change-Id: Ic9b76bc5754dc8b98a11da9fadbeb9d6ace87d5b Closes-bug: #1642678
Notes
Notes (review): Code-Review+1: Tom Barron <tpb@dyncloud.net> Code-Review+2: S├ębastien Han <seb@redhat.com> Workflow+1: S├ębastien Han <seb@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 01 Mar 2017 14:14:57 +0000 Reviewed-on: https://review.openstack.org/438342 Project: openstack/devstack-plugin-ceph Branch: refs/heads/master
Diffstat (limited to 'devstack')
-rw-r--r--devstack/lib/ceph8
1 files changed, 5 insertions, 3 deletions
diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index 4625ea9..490d607 100644
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -800,10 +800,12 @@ function install_ceph {
800 install_package software-properties-common 800 install_package software-properties-common
801 801
802 if is_ceph_enabled_for_service manila; then 802 if is_ceph_enabled_for_service manila; then
803 wget -q -O- 'https://download.ceph.com/keys/autobuild.asc' \ 803 # The 'apt' package manager needs the following package to access
804 | sudo apt-key add - 804 # HTTPS enabled repositories such as the Ceph repos hosted by the
805 # shaman/chacra system.
806 install_package apt-transport-https
805 807
806 echo "deb http://gitbuilder.ceph.com/ceph-deb-$(lsb_release -sc)-$(uname -m)-basic/ref/jewel $(lsb_release -sc) main" | \ 808 curl -L https://shaman.ceph.com/api/repos/ceph/jewel/latest/ubuntu/xenial/repo | \
807 sudo tee /etc/apt/sources.list.d/ceph.list 809 sudo tee /etc/apt/sources.list.d/ceph.list
808 810
809 CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs1" 811 CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs1"