diff options
| author |   shuai chen <chenshuai@huawei.com> | 2016-08-13 09:35:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-13 09:35:45 +0000 |
| commit | 865e211e752f0de17d560da3c4641c1e3d9af8bb (patch) | |
| tree | 52c99fecedced374bd7f081e9b1700f3c9089f3c /build/templates | |
| parent | 741a8208fec23724dc4ef87d2e8267c14f5beb60 (diff) | |
| parent | 7335f50c7e8c4dc348d399b8707c0e11d7064d9b (diff) | |
Merge "FIX centos7 ppa create failure"
Diffstat (limited to 'build/templates')
| -rw-r--r-- | build/templates/RedHat_mitaka.tmpl | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/build/templates/RedHat_mitaka.tmpl b/build/templates/RedHat_mitaka.tmpl index 07728289..4d6b26fd 100644 --- a/build/templates/RedHat_mitaka.tmpl +++ b/build/templates/RedHat_mitaka.tmpl @@ -10,11 +10,12 @@ 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-6.noarch.rpm -y -yum install http://rdo.fedorapeople.org/openstack-$OPV/rdo-release-${OPV}.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 +yum install -y centos-release-openstack-${OPV} # 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 +# sed -i 's/epel-Derived from Red Hat Enterprise Linux 7.1 (Source)/epel-7/g' /etc/yum.repos.d/rdo-release.repo # add mongodb repo cat <<EOF >/etc/yum.repos.d/mongodb.repo @@ -44,26 +45,6 @@ gpgkey=http://rpms.adiscon.com/RPM-GPG-KEY-Adiscon protect=1 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 -enabled=1 -priority=2 -gpgcheck=1 -type=rpm-md -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 -enabled=1 -priority=2 -gpgcheck=1 -type=rpm-md -gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc -EOF - cat <<EOF >>/etc/yum.conf exclude=mongodb-org,mongodb-org-server EOF |