From: Sandon Van Ness <sandon@inktank.com>
Date: Fri, 16 Jan 2015 00:51:20 +0000 (-0800)
Subject: Better detection for what epel to install and new URL.
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7305e1c5e580d130e66d6f636e1ca3596195e80f;p=autobuild-ceph.git

Better detection for what epel to install and new URL.


Signed-off-by: Sandon Van Ness <sandon@inktank.com>
---

diff --git a/fabfile.py b/fabfile.py
index ffca234..d017456 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -74,8 +74,11 @@ env.roledefs['gitbuilder_apache_hadoop'] = [
 
 
 def _rpm_install(*packages):
-    sudo("lsb_release -d | grep '7.0 Beta' | rpm -qa | grep epel-release || rpm -Uvh http://apt-mirror.front.sepia.ceph.com/misc-rpms/epel-release-7-0.2.noarch.rpm")
-    sudo("lsb_release -d | egrep '(Fedora|SUSE)' || rpm -qa | grep epel-release ||rpm -Uvh http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm")
+    lsb = sudo("lsb_release -d")
+    if '7.' in lsb:
+        sudo("rpm -qa | grep epel-release || rpm -Uvh http://apt-mirror.front.sepia.ceph.com/non-repo-rpms/epel-release-7-0.2.noarch.rpm")
+    if '6.' in lsb:
+        sudo("rpm -qa | grep epel-release || rpm -Uvh http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm")
     # This will update to the newest release of the distro IE centos 6.3 to centos 6.5, etc...
     # sudo("yum --assumeyes --quiet update")
     sudo(' '.join(