From 6d01a64e1d106e45cf202379dcbb02ead647c55c Mon Sep 17 00:00:00 2001
From: Ramana Raja <rraja@redhat.com>
Date: Mon, 27 Feb 2017 11:46:26 +0530
Subject: [PATCH] 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
---
 devstack/lib/ceph | 8 +++++---
 1 file 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 {
         install_package software-properties-common
 
         if is_ceph_enabled_for_service manila; then
-            wget -q -O- 'https://download.ceph.com/keys/autobuild.asc' \
-                | sudo apt-key add -
+            # The 'apt' package manager needs the following package to access
+            # HTTPS enabled repositories such as the Ceph repos hosted by the
+            # shaman/chacra system.
+            install_package apt-transport-https
 
-            echo "deb http://gitbuilder.ceph.com/ceph-deb-$(lsb_release -sc)-$(uname -m)-basic/ref/jewel $(lsb_release -sc) main" | \
+            curl -L https://shaman.ceph.com/api/repos/ceph/jewel/latest/ubuntu/xenial/repo | \
                 sudo tee /etc/apt/sources.list.d/ceph.list
 
             CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs1"