diff options
| author |   QiLiang <liangqi1@huawei.com> | 2016-08-11 04:16:58 +0800 |
|---|---|---|
| committer | QiLiang <liangqi1@huawei.com> | 2016-08-12 17:19:45 +0800 |
| commit | 7335f50c7e8c4dc348d399b8707c0e11d7064d9b (patch) | |
| tree | 5c114bcd4dee3d1e3d31d14275097f8018cf597c /build | |
| parent | e489f1add0aca1db9e2a33972acc611e8d3b2dbb (diff) | |
FIX centos7 ppa create failure
ceph repo update, related upstream link:
http://tracker.ceph.com/issues/16916
centos ceph-deploy rpm download failure workaround
Error info:
Package python-setuptools is obsoleted by python2-setuptools,
but obsoleting package does not provide for requirements
--> Finished Dependency Resolution
Error: Package: ceph-deploy-1.5.31-1.el7.noarch (centos-ceph-hammer)
Requires: python-distribute
Available: python-setuptools-0.9.8-4.el7.noarch (base)
python-distribute = 0.9.8-4.el7
You could try using --skip-broken to work around the problem
You could try running: rpm -Va --nofiles --nodigest
JIRA: COMPASS-455
Change-Id: Ibebc8b25786b12308d5963e77b0f7959d700113a
Signed-off-by: QiLiang <liangqi1@huawei.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/os/centos/rhel7/mitaka/Dockerfile.tmpl | 2 | ||||
| -rw-r--r-- | build/templates/RedHat_mitaka.tmpl | 27 |
2 files changed, 5 insertions, 24 deletions
diff --git a/build/os/centos/rhel7/mitaka/Dockerfile.tmpl b/build/os/centos/rhel7/mitaka/Dockerfile.tmpl index adb930ff..2ea2b828 100644 --- a/build/os/centos/rhel7/mitaka/Dockerfile.tmpl +++ b/build/os/centos/rhel7/mitaka/Dockerfile.tmpl @@ -1,4 +1,4 @@ -FROM centos:7.1.1503 +FROM centos:7.2.1511 MAINTAINER Chigang(Justin) <chigang@huawei.com> # set cache enable 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 |