summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-05-04 07:23:44 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-04 07:23:44 +0000
commit4dc9869f0c1f9ff585e2a1e28b6f3e0b5605ba5e (patch)
treed0784ce4c744445a2e799bc1e58adb1dd5816149
parent554134d60da77a877f52ab4befcaf17dd297f8fd (diff)
parent6ad3e58c134ccf18ff1d3400e1b9002635a1bb2b (diff)
Merge "FIX:make repo fail due to incorrect cheetah template"
-rw-r--r--build/templates/RedHat_liberty.tmpl6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/templates/RedHat_liberty.tmpl b/build/templates/RedHat_liberty.tmpl
index 9cf02af7..24781785 100644
--- a/build/templates/RedHat_liberty.tmpl
+++ b/build/templates/RedHat_liberty.tmpl
@@ -11,7 +11,7 @@ yum clean all
yum install yum-plugin-priorities -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
+yum install http://rdo.fedorapeople.org/openstack-$OPV/rdo-release-${OPV}.rpm -y
# modify centos7 repo for workaround
sed -i 's/epel-Derived from Red Hat Enterprise Linux 7.1 (Source)/epel-7/g' /etc/yum.repos.d/rdo-release.repo
@@ -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-infernalis/el7/x86_64
+baseurl=http://ceph.com/rpm-hammer/rhel7/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-infernalis/el7/noarch
+baseurl=http://ceph.com/rpm-hammer/rhel7/noarch
enabled=1
priority=2
gpgcheck=1