From a552b3fe761192bd49c3840e9815ada3902f59ca Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler.smith@windriver.com>
Date: Tue, 16 Apr 2019 14:49:07 -0400
Subject: [PATCH] Upversioning Keystone and Barbican

Adding stein dependencies to the RPM list and adding the Stein centos repo
to our configured mirror repos.

Change-Id: I10669c7e7160217cc95c5e4811a0d7e3eab85772
Story: 2004765
Task: 28883
Depends-On: https://review.openstack.org/#/c/653082
Signed-off-by: Tyler Smith <tyler.smith@windriver.com>
---
 centos-mirror-tools/rpms_centos.lst           | 93 ++++++++++---------
 .../StarlingX_CentOS-OpenStack-stein.repo     | 41 ++++++++
 2 files changed, 91 insertions(+), 43 deletions(-)
 create mode 100644 centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-stein.repo

diff --git a/centos-mirror-tools/rpms_centos.lst b/centos-mirror-tools/rpms_centos.lst
index 7cd6692c..e767c228 100644
--- a/centos-mirror-tools/rpms_centos.lst
+++ b/centos-mirror-tools/rpms_centos.lst
@@ -926,11 +926,12 @@ openssl-1.0.2k-16.el7.x86_64.rpm
 openssl-devel-1.0.2k-16.el7.x86_64.rpm
 openssl-libs-1.0.2k-16.el7.x86_64.rpm
 openstack-aodh-5.1.0-1.el7.src.rpm
-openstack-barbican-5.0.1-1.el7.noarch.rpm
-openstack-barbican-api-5.0.1-1.el7.noarch.rpm
-openstack-barbican-common-5.0.1-1.el7.noarch.rpm
-openstack-barbican-keystone-listener-5.0.1-1.el7.noarch.rpm
-openstack-barbican-worker-5.0.1-1.el7.noarch.rpm
+openstack-barbican-8.0.0-0.1.0rc1.el7.noarch.rpm
+openstack-barbican-api-8.0.0-0.1.0rc1.el7.noarch.rpm
+openstack-barbican-common-8.0.0-0.1.0rc1.el7.noarch.rpm
+openstack-barbican-keystone-listener-8.0.0-0.1.0rc1.el7.noarch.rpm
+openstack-barbican-worker-8.0.0-0.1.0rc1.el7.noarch.rpm
+openstack-keystone-15.0.0-0.2.0rc2.el7.src.rpm
 openstack-macros-2018.1.2-0.noarch.rpm
 openstack-nova-cert-14.0.8-1.el7.noarch.rpm
 openstack-panko-3.1.0-1.el7.src.rpm
@@ -1129,26 +1130,31 @@ PyQt4-4.12-1.el7.x86_64.rpm
 pysendfile-2.0.0-5.el7.x86_64.rpm
 pyserial-2.6-6.el7.noarch.rpm
 python-2.7.5-76.el7.src.rpm
+python2-alembic-0.9.7-1.el7.noarch.rpm
 python2-amqp-2.1.4-3.el7.noarch.rpm
 python-aodhclient-0.9.0-1.el7.src.rpm
 python2-appdirs-1.4.0-4.el7.noarch.rpm
+python2-asn1crypto-0.23.0-2.el7.noarch.rpm
 python2-automaton-1.12.1-1.el7.noarch.rpm
 python2-babel-2.3.4-1.el7.noarch.rpm
+python2-barbican-8.0.0-0.1.0rc1.el7.noarch.rpm
 python2-barbicanclient-4.5.3-1.el7.noarch.rpm
 python2-bcrypt-3.1.4-4.el7.x86_64.rpm
 python2-bitmath-1.3.1-1.el7.noarch.rpm
 python2-boto-2.45.0-3.el7.noarch.rpm
 python2-cachez-0.1.0-2.el7.noarch.rpm
-python2-castellan-0.12.2-1.el7.noarch.rpm
+python2-castellan-0.19.0-1.el7.noarch.rpm
 python2-certifi-2018.10.15-1.el7.noarch.rpm
 python2-ceilometerclient-2.9.0-1.el7.noarch.rpm
+python2-cffi-1.11.2-1.el7.x86_64.rpm
+python2-chardet-3.0.4-7.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
 python2-coverage-4.4.1-1.el7.x86_64.rpm
 python2-crypto-2.6.1-15.el7.x86_64.rpm
-python2-cryptography-1.7.2-2.el7.x86_64.rpm
+python2-cryptography-2.5-1.el7.x86_64.rpm
 python2-cursive-0.1.2-1.el7.noarch.rpm
 python2-cycler-0.10.0-2.el7.noarch.rpm
 python2-Cython-0.25.2-3.el7.x86_64.rpm
@@ -1156,6 +1162,7 @@ python2-daiquiri-1.2.1-1.el7.noarch.rpm
 python2-dateutil-2.6.1-1.el7.noarch.rpm
 python2-ddt-1.1.3-1.el7.noarch.rpm
 python2-debtcollector-1.17.1-1.el7.noarch.rpm
+python2-defusedxml-0.5.0-2.el7.noarch.rpm
 python2-deprecation-1.0-3.el7.noarch.rpm
 python2-designateclient-2.7.0-1.el7.noarch.rpm
 python2-django-babel-0.4.0-2.el7.noarch.rpm
@@ -1183,6 +1190,7 @@ python2-hacking-0.13.0-1.el7.noarch.rpm
 python2-idna-2.5-1.el7.noarch.rpm
 python2-imagesize-0.7.1-5.el7.noarch.rpm
 python2-influxdb-4.0.0-1.el7.1.noarch.rpm
+python2-ipaddress-1.0.18-5.el7.noarch.rpm
 python2-iso8601-0.1.11-7.el7.noarch.rpm
 python2-jinja2-2.8.1-1.el7.noarch.rpm
 python2-jmespath-0.9.0-5.el7.noarch.rpm
@@ -1192,8 +1200,11 @@ python2-jsonpatch-1.21-1.el7.noarch.rpm
 python2-jsonpath-rw-ext-1.0.0-1.el7.noarch.rpm
 python2-jsonpointer-1.10-4.el7.noarch.rpm
 python2-jsonschema-2.5.1-3.el7.noarch.rpm
-python2-keystonemiddleware-4.17.0-1.el7.noarch.rpm
+python2-jwt-1.6.1-1.el7.noarch.rpm
+python2-keystonemiddleware-5.2.0-1.el7.noarch.rpm
 python2-kombu-4.0.2-5.el7.noarch.rpm
+python2-ldap3-2.4.1-3.el7.noarch.rpm
+python2-ldappool-2.1.0-1.el7.noarch.rpm
 python2-lz4-0.9.0-1.el7.x86_64.rpm
 python2-marathon-0.8.8-1.el7.noarch.rpm
 python2-markupsafe-0.23-16.el7.x86_64.rpm
@@ -1218,29 +1229,29 @@ 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-cache-1.30.3-1.el7.noarch.rpm
 python2-oslo-concurrency-3.27.0-1.el7.noarch.rpm
-python2-oslo-config-4.11.1-1.el7.noarch.rpm
-python2-oslo-config-5.2.0-1.el7.noarch.rpm
-python2-oslo-context-2.17.1-1.el7.noarch.rpm
-python2-oslo-context-2.20.0-1.el7.noarch.rpm
-python2-oslo-db-4.25.1-1.el7.noarch.rpm
+python2-oslo-config-6.8.1-1.el7.noarch.rpm
+python2-oslo-context-2.22.1-1.el7.noarch.rpm
+python2-oslo-db-4.40.0-1.el7.noarch.rpm
+python2-oslo-db-tests-4.40.0-1.el7.noarch.rpm
 python2-oslo-i18n-3.17.1-1.el7.noarch.rpm
-python2-oslo-log-3.30.2-1.el7.noarch.rpm
-python2-oslo-log-3.36.0-1.el7.noarch.rpm
-python-oslo-log-lang-3.36.0-1.el7.noarch.rpm
-python2-oslo-middleware-3.30.1-1.el7.noarch.rpm
-python2-oslo-policy-1.33.2-1.el7.noarch.rpm
+python2-oslo-log-3.39.2-1.el7.noarch.rpm
+python-oslo-log-lang-3.39.2-1.el7.noarch.rpm
+python2-oslo-middleware-3.36.0-1.el7.noarch.rpm
+python2-oslo-policy-2.1.1-1.el7.noarch.rpm
 python2-oslo-privsep-1.22.1-1.el7.noarch.rpm
 python2-oslo-reports-1.22.1-1.el7.noarch.rpm
 python2-oslo-rootwrap-5.9.1-1.el7.noarch.rpm
 python2-oslo-serialization-2.20.2-1.el7.noarch.rpm
+python2-oslo-service-1.38.0-1.el7.noarch.rpm
 python2-oslo-sphinx-4.15.2-1.el7.noarch.rpm
 python2-oslotest-2.17.1-1.el7.noarch.rpm
+python2-oslo-upgradecheck-0.2.1-1.el7.noarch.rpm
 python2-oslo-utils-3.28.3-1.el7.noarch.rpm
-python2-oslo-utils-3.35.1-1.el7.noarch.rpm
-python2-oslo-versionedobjects-1.26.2-1.el7.noarch.rpm
-python2-oslo-versionedobjects-tests-1.26.2-1.el7.noarch.rpm
+python2-oslo-utils-3.40.3-1.el7.noarch.rpm
+python2-oslo-versionedobjects-1.33.3-1.el7.noarch.rpm
+python2-oslo-versionedobjects-tests-1.33.3-1.el7.noarch.rpm
 python2-oslo-vmware-2.23.1-1.el7.noarch.rpm
 python2-osprofiler-1.11.0-1.el7.noarch.rpm
 python2-os-traits-0.3.3-1.el7.noarch.rpm
@@ -1272,17 +1283,16 @@ python2-pyOpenSSL-16.2.0-3.el7.noarch.rpm
 python2-pyOpenSSL-17.3.0-3.el7.noarch.rpm
 python2-pyparsing-2.1.10-3.el7.noarch.rpm
 python2-pyroute2-0.4.19-1.el7.noarch.rpm
-python2-pysaml2-3.0.2-2.el7.noarch.rpm
+python2-pysaml2-4.5.0-4.el7.noarch.rpm
 python2-pysnmp-4.3.2-3.el7.noarch.rpm
 python2-pytest-3.0.6-2.el7.noarch.rpm
 python2-qpid-proton-0.24.0-2.el7.x86_64.rpm
 python2-rcssmin-1.0.6-2.el7.x86_64.rpm
 python2-reno-2.5.0-1.el7.noarch.rpm
-python2-requests-2.14.2-1.el7.noarch.rpm
 python2-requests-oauthlib-0.8.0-5.el7.noarch.rpm
-python2-requestsexceptions-1.3.0-1.el7.noarch.rpm
+python2-requestsexceptions-1.4.0-1.el7.noarch.rpm
 python2-retryz-0.1.8-1.el7.noarch.rpm
-python2-rfc3986-0.3.1-1.el7.noarch.rpm
+python2-rfc3986-1.2.0-1.el7.noarch.rpm
 python2-rjsmin-1.0.12-2.el7.x86_64.rpm
 python2-rpm-macros-3-22.el7.noarch.rpm
 python2-rsa-3.4.1-1.el7.noarch.rpm
@@ -1327,6 +1337,7 @@ python2-ujson-1.35-1.el7.x86_64.rpm
 python2-uritemplate-3.0.0-1.el7.noarch.rpm
 python2-vine-1.1.3-2.el7.noarch.rpm
 python2-weakrefmethod-1.0.2-3.el7.noarch.rpm
+python2-webob-1.8.2-1.el7.noarch.rpm
 python2-whoosh-2.7.4-3.el7.noarch.rpm
 python2-wsgi_intercept-1.2.2-1.el7.noarch.rpm
 python2-XStatic-1.0.1-8.el7.noarch.rpm
@@ -1347,15 +1358,15 @@ python2-XStatic-roboto-fontface-0.5.0.0-1.el7.noarch.rpm
 python2-XStatic-smart-table-1.4.13.2-1.el7.noarch.rpm
 python2-XStatic-termjs-0.0.7.0-1.el7.noarch.rpm
 python2-XStatic-tv4-1.2.7.0-0.1.pre_review.el7.noarch.rpm
+python2-yappi-1.0-1.el7.x86_64.rpm
 python2-yaql-1.1.0-3.el7.noarch.rpm
 python2-yaql-1.1.3-2.el7.noarch.rpm
 python2-zake-0.2.2-2.el7.noarch.rpm
 python2-zaqarclient-1.7.0-1.el7.noarch.rpm
-python-alembic-0.8.10-1.el7.noarch.rpm
+python-aniso8601-0.82-3.el7.noarch.rpm
 python-anyjson-0.3.3-3.el7.noarch.rpm
 python-backports-1.0-8.el7.x86_64.rpm
 python-backports-ssl_match_hostname-3.5.0.1-1.el7.noarch.rpm
-python-barbican-5.0.1-1.el7.noarch.rpm
 python-beaker-1.5.4-10.el7.noarch.rpm
 python-beautifulsoup4-4.6.0-1.el7.noarch.rpm
 python-betamax-0.7.1-1.el7.noarch.rpm
@@ -1363,9 +1374,8 @@ python-Bottleneck-0.7.0-1.el7.x86_64.rpm
 python-bson-3.0.3-1.el7.x86_64.rpm
 python-cachetools-1.1.6-2.el7.noarch.rpm
 python-ceilometermiddleware-1.1.0-1.el7.noarch.rpm
-python-cffi-1.6.0-5.el7.x86_64.rpm
 python-characteristic-14.3.0-4.el7.noarch.rpm
-python-chardet-2.2.1-1.el7_1.noarch.rpm
+python-click-6.3-1.el7.noarch.rpm
 python-cliff-2.8.2-1.el7.noarch.rpm
 python-cliff-tablib-1.1-3.el7.noarch.rpm
 python-cmd2-0.6.8-8.el7.noarch.rpm
@@ -1401,7 +1411,8 @@ python-extras-0.0.3-2.el7.noarch.rpm
 python-firewall-0.5.3-5.el7.noarch.rpm
 python-fixtures-3.0.0-2.el7.noarch.rpm
 python-flake8-2.4.1-2.el7.noarch.rpm
-python-flask-0.10.1-4.el7.noarch.rpm
+python2-flask-1.0.2-1.el7.noarch.rpm
+python2-flask-restful-0.3.6-7.el7.noarch.rpm
 python-freezegun-0.3.8-2.el7.noarch.rpm
 python-glance-store-0.22.0-1.el7.src.rpm
 python-google-auth-1.3.0-1.el7.src.rpm
@@ -1422,12 +1433,9 @@ python-kerberos-1.1-15.el7.x86_64.rpm
 python-keyring-5.7.1-1.el7.src.rpm
 python-keystoneauth1-3.1.0-1.el7.src.rpm
 python-keystoneclient-3.13.0-1.el7.src.rpm
-python-keystonemiddleware-4.17.0-1.el7.src.rpm
 python-kitchen-1.1.1-5.el7.noarch.rpm
 python-kmod-0.9-4.el7.x86_64.rpm
 python-ldap-2.4.15-2.el7.x86_64.rpm
-python-ldap3-0.9.8.6-2.el7.noarch.rpm
-python-ldappool-1.0-4.el7.noarch.rpm
 python-lesscpy-0.9j-4.el7.noarch.rpm
 python-linecache2-1.0.0-1.el7.noarch.rpm
 python-linux-procfs-0.4.9-4.el7.noarch.rpm
@@ -1452,21 +1460,21 @@ python-openstackclient-3.12.1-1.el7.src.rpm
 python-openstackdocstheme-1.11.0-1.el7.src.rpm
 python-openstack-nose-plugin-0.11-4.el7.noarch.rpm
 python-osc-lib-1.7.0-1.el7.src.rpm
-python-oslo-cache-lang-1.25.1-1.el7.noarch.rpm
+python-oslo-cache-lang-1.30.3-1.el7.noarch.rpm
 python-oslo-concurrency-3.21.1-1.el7.src.rpm
-python-oslo-db-lang-4.25.1-1.el7.noarch.rpm
+python-oslo-db-lang-4.40.0-1.el7.noarch.rpm
 python-oslo-db-tests-4.25.1-1.el7.noarch.rpm
 python-oslo-i18n-lang-3.17.1-1.el7.noarch.rpm
-python-oslo-log-lang-3.30.2-1.el7.noarch.rpm
+python-oslo-log-lang-3.39.2-1.el7.noarch.rpm
 python-oslo-messaging-5.30.6-1.el7.src.rpm
-python-oslo-middleware-lang-3.30.1-1.el7.noarch.rpm
-python-oslo-policy-lang-1.33.2-1.el7.noarch.rpm
+python-oslo-middleware-lang-3.36.0-1.el7.noarch.rpm
+python-oslo-policy-lang-2.1.1-1.el7.noarch.rpm
 python-oslo-privsep-lang-1.22.1-1.el7.noarch.rpm
 python-oslo-concurrency-lang-3.27.0-1.el7.noarch.rpm
 python-oslo-service-1.25.1-1.el7.src.rpm
 python-oslo-utils-lang-3.28.3-1.el7.noarch.rpm
-python-oslo-utils-lang-3.35.1-1.el7.noarch.rpm
-python-oslo-versionedobjects-lang-1.26.2-1.el7.noarch.rpm
+python-oslo-utils-lang-3.40.3-1.el7.noarch.rpm
+python-oslo-versionedobjects-lang-1.33.3-1.el7.noarch.rpm
 python-oslo-vmware-lang-2.23.1-1.el7.noarch.rpm
 python2-osprofiler-2.3.0-1.el7.noarch.rpm
 python-os-testr-0.8.2-1.el7.noarch.rpm
@@ -1495,7 +1503,7 @@ python-pyudev-0.15-9.el7.noarch.rpm
 python-redis-2.10.3-1.el7.noarch.rpm
 python-repoze-lru-0.4-3.el7.noarch.rpm
 python-repoze-who-2.1-1.el7.noarch.rpm
-python-requests-2.14.2-1.el7.src.rpm
+python-requests-2.21.0-2.el7.src.rpm
 python-requests-kerberos-0.8.0-3.el7.noarch.rpm
 python-retrying-1.2.3-4.el7.noarch.rpm
 python-routes-2.4.1-1.el7.noarch.rpm
@@ -1536,7 +1544,6 @@ python-versiontools-1.9.1-4.el7.noarch.rpm
 python-voluptuous-0.8.9-1.el7.src.rpm
 python-waitress-0.8.9-5.el7.noarch.rpm
 python-warlock-1.0.1-1.el7.noarch.rpm
-python-webob-1.7.2-1.el7.noarch.rpm
 python-websocket-client-0.34.0-3.el7.noarch.rpm
 python-websockify-0.8.0-1.el7.noarch.rpm
 python-webtest-2.0.23-1.el7.noarch.rpm
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-stein.repo b/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-stein.repo
new file mode 100644
index 00000000..7bd2f642
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-stein.repo
@@ -0,0 +1,41 @@
+# CentOS-OpenStack-stein.repo
+#
+# Please see http://wiki.centos.org/SpecialInterestGroup/Cloud for more
+# information
+
+[centos-openstack-stein]
+name=CentOS-7 - OpenStack stein
+baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-stein/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
+exclude=sip,PyQt4
+
+[centos-openstack-stein-test]
+name=CentOS-7 - OpenStack stein Testing
+baseurl=https://buildlogs.centos.org/centos/7/cloud/$basearch/openstack-stein/
+gpgcheck=0
+enabled=0
+exclude=sip,PyQt4
+
+[centos-openstack-stein-debuginfo]
+name=CentOS-7 - OpenStack stein - Debug
+baseurl=http://debuginfo.centos.org/centos/7/cloud/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
+exclude=sip,PyQt4
+
+[centos-openstack-Stein-source]
+name=CentOS-7 - OpenStack Stein - Source
+baseurl=http://vault.centos.org/centos/7.6.1810/cloud/Source/openstack-stein/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
+exclude=sip,PyQt4
+
+[rdo-trunk-stein-tested]
+name=OpenStack stein Trunk Tested
+baseurl=https://trunk.rdoproject.org/centos7-stein/current-passed-ci/
+gpgcheck=0
+enabled=0