FIX:make repo fail due to incorrect cheetah template

JIRA:COMPASS-383
  - failed to parse template file

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

diff --git a/build/templates/RedHat_liberty.tmpl b/build/templates/RedHat_liberty.tmpl
index 9cf02af..2478178 100644 (file)
--- 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