From: grakiss <grakiss.wanglei@huawei.com>
Date: Tue, 26 Apr 2016 11:15:29 +0000 (-0400)
Subject: FIX:upgrade epel to 7-6 and ceph to infernalis
X-Git-Tag: colorado.1.0~138
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F12667%2F1;p=compass4nfv.git

FIX:upgrade epel to 7-6 and ceph to infernalis

JIRA:COMPASS-379

Change-Id: I678a4ca2a17dac842624d1deda5576e9feeac622
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
---

diff --git a/build/templates/RedHat_liberty.tmpl b/build/templates/RedHat_liberty.tmpl
index 74aada7b..9cf02af7 100644
--- a/build/templates/RedHat_liberty.tmpl
+++ b/build/templates/RedHat_liberty.tmpl
@@ -10,7 +10,7 @@ yum repolist
 yum clean all
 
 yum install yum-plugin-priorities -y
-yum install http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm -y
+yum install http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-6.noarch.rpm -y
 yum install http://rdo.fedorapeople.org/openstack-$OPV/rdo-release-$OPV.rpm -y
 
 # modify centos7 repo for workaround
@@ -47,7 +47,7 @@ EOF
 cat <<EOF >/etc/yum.repos.d/ceph.repo
 [ceph]
 name=Ceph packages for x86_64
-baseurl=http://ceph.com/rpm-hammer/rhel7/x86_64
+baseurl=http://ceph.com/rpm-infernalis/el7/x86_64
 enabled=1
 priority=2
 gpgcheck=1
@@ -56,7 +56,7 @@ gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
 
 [ceph-noarch]
 name=Ceph noarch packages
-baseurl=http://ceph.com/rpm-hammer/rhel7/noarch
+baseurl=http://ceph.com/rpm-infernalis/el7/noarch
 enabled=1
 priority=2
 gpgcheck=1