From 2d17c61f08861abcbf5b7d9ab4cd86f918aaa01e Mon Sep 17 00:00:00 2001 From: Shuicheng Lin Date: Thu, 18 Apr 2019 17:12:16 +0800 Subject: [PATCH] move several packages from 3rdparties lst to centos lst These packages could be found in centos repo also, so move them to centos lst. Story: 2005484 Task: 30577 Change-Id: I23abc56b962c2a5d0be2b170a59e67632c12083f Signed-off-by: Shuicheng Lin --- centos-mirror-tools/rpms_3rdparties.lst | 5 ----- centos-mirror-tools/rpms_centos.lst | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/centos-mirror-tools/rpms_3rdparties.lst b/centos-mirror-tools/rpms_3rdparties.lst index 699dec35..b6ee294e 100644 --- a/centos-mirror-tools/rpms_3rdparties.lst +++ b/centos-mirror-tools/rpms_3rdparties.lst @@ -1,7 +1,6 @@ ansible-2.7.5-1.el7.ans.noarch.rpm#https://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.7.5-1.el7.ans.noarch.rpm libvirt-python-4.7.0-1.fc28.src.rpm#https://libvirt.org/sources/python/libvirt-python-4.7.0-1.fc28.src.rpm novnc-0.6.2-1.el7.noarch.rpm#http://cbs.centos.org/kojifiles/packages/novnc/0.6.2/1.el7/noarch/novnc-0.6.2-1.el7.noarch.rpm -python2-docker-3.3.0-1.el7.noarch.rpm#http://cbs.centos.org/kojifiles/packages/python-docker/3.3.0/1.el7/noarch/python2-docker-3.3.0-1.el7.noarch.rpm python2-httpbin-0.5.0-6.el7.noarch.rpm#http://cbs.centos.org/kojifiles/packages/python-httpbin/0.5.0/6.el7/noarch/python2-httpbin-0.5.0-6.el7.noarch.rpm python2-kubernetes-8.0.0-8.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-kubernetes/8.0.0/8.el7/noarch/python2-kubernetes-8.0.0-8.el7.noarch.rpm python2-pytest-httpbin-0.2.3-6.el7.noarch.rpm#http://cbs.centos.org/kojifiles/packages/python-pytest-httpbin/0.2.3/6.el7/noarch/python2-pytest-httpbin-0.2.3-6.el7.noarch.rpm @@ -13,9 +12,5 @@ python2-wheel-0.31.1-3.fc30.noarch.rpm#https://kojipkgs.fedoraproject.org/packag python3-wheel-0.31.1-3.fc30.noarch.rpm#https://kojipkgs.fedoraproject.org/packages/python-wheel/0.31.1/3.fc30/noarch/python3-wheel-0.31.1-3.fc30.noarch.rpm python2-pip-9.0.3-6.fc29.noarch.rpm#https://kojipkgs.fedoraproject.org/packages/python-pip/9.0.3/6.fc29/noarch/python2-pip-9.0.3-6.fc29.noarch.rpm python3-pip-9.0.3-6.fc29.noarch.rpm#https://kojipkgs.fedoraproject.org/packages/python-pip/9.0.3/6.fc29/noarch/python3-pip-9.0.3-6.fc29.noarch.rpm -python2-cliff-2.13.0-1.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-cliff/2.13.0/1.el7/noarch/python2-cliff-2.13.0-1.el7.noarch.rpm python2-openstackdocstheme-1.23.2-1.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-openstackdocstheme/1.23.2/1.el7/noarch/python2-openstackdocstheme-1.23.2-1.el7.noarch.rpm -python2-os-service-types-1.3.0-1.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-os-service-types/1.3.0/1.el7/noarch/python2-os-service-types-1.3.0-1.el7.noarch.rpm -python2-osc-lib-1.11.1-1.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-osc-lib/1.11.1/1.el7/noarch/python2-osc-lib-1.11.1-1.el7.noarch.rpm -python2-osc-lib-tests-1.11.1-1.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-osc-lib/1.11.1/1.el7/noarch/python2-osc-lib-tests-1.11.1-1.el7.noarch.rpm python2-sphinxcontrib-apidoc-0.2.1-6.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-sphinxcontrib-apidoc/0.2.1/6.el7/noarch/python2-sphinxcontrib-apidoc-0.2.1-6.el7.noarch.rpm diff --git a/centos-mirror-tools/rpms_centos.lst b/centos-mirror-tools/rpms_centos.lst index 78a721f0..7cd6692c 100644 --- a/centos-mirror-tools/rpms_centos.lst +++ b/centos-mirror-tools/rpms_centos.lst @@ -1142,6 +1142,7 @@ python2-cachez-0.1.0-2.el7.noarch.rpm python2-castellan-0.12.2-1.el7.noarch.rpm python2-certifi-2018.10.15-1.el7.noarch.rpm python2-ceilometerclient-2.9.0-1.el7.noarch.rpm +python2-cliff-2.13.0-1.el7.noarch.rpm python2-colorama-0.3.7-2.el7.noarch.rpm python2-congressclient-1.8.0-1.el7.noarch.rpm python2-cotyledon-1.6.3-1.el7.noarch.rpm @@ -1161,6 +1162,7 @@ python2-django-babel-0.4.0-2.el7.noarch.rpm python2-django-compressor-2.1-5.el7.noarch.rpm python2-django-debreach-1.5.2-1.el7.noarch.rpm python2-django-formtools-2.1-1.el7.noarch.rpm +python2-docker-3.3.0-1.el7.noarch.rpm python2-dulwich-0.18.4-1.el7.x86_64.rpm python2-extras-1.0.0-2.el7.noarch.rpm python2-fasteners-0.14.1-6.el7.noarch.rpm @@ -1213,6 +1215,9 @@ python2-oauthlib-2.0.1-8.el7.noarch.rpm python2-olefile-0.46-1.el7.noarch.rpm python2-openstack-doc-tools-1.3.0-2.el7.noarch.rpm python2-os-client-config-1.28.0-1.el7.noarch.rpm +python2-os-service-types-1.3.0-1.el7.noarch.rpm +python2-osc-lib-1.11.1-1.el7.noarch.rpm +python2-osc-lib-tests-1.11.1-1.el7.noarch.rpm python2-oslo-cache-1.25.1-1.el7.noarch.rpm python2-oslo-concurrency-3.27.0-1.el7.noarch.rpm python2-oslo-config-4.11.1-1.el7.noarch.rpm