From 6909565540525fb2791d68ab93f4e88a3d83f2a9 Mon Sep 17 00:00:00 2001
From: Deepak C Shetty <deepakcs@redhat.com>
Date: Tue, 1 Dec 2015 12:52:32 +0530
Subject: [PATCH] lib/ceph: Fix fedora broken link

Removes the broken fedora 20 url and ensures that ceph and
radosgw packages are installed from the distro repos. See
the associated LP bug 1521073 for more details.

Change-Id: Id11c51bd5451f5c7886696b519ad43f012e83d74
Closes-bug: 1521073
---
 devstack/lib/ceph | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index 3f234c9..3e16f7c 100644
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -497,12 +497,11 @@ if is_ubuntu; then
     | sudo tee /etc/apt/sources.list.d/ceph.list
 
     install_package ceph radosgw libnss3-tools
-elif is_fedora; then
-    sudo rpm --import 'https://download.ceph.com/keys/release.asc'
-
-    sudo rpm \
-    -Uvh http://ceph.com/rpm/fc20/x86_64/ceph-${CEPH_RELEASE}.el6.noarch.rpm
-
+else
+    # Install directly from distro repos. See LP bug 1521073 for more details.
+    # If distro doesn't carry latest ceph, users can install latest ceph repo
+    # for their distro (if available) from download.ceph.com and then do
+    # stack.sh
     install_package ceph ceph-radosgw
 fi
 }