From 847198b8e39a017ada61682e843f0066fcfd6990 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Thu, 4 Jun 2020 19:23:52 +0200
Subject: [PATCH] Second round of Victoria updates

Change-Id: Ib4bdfcc9ba170b88a7d85d4de57542e19c1af7ee
---
 openstack/castellan/castellan.spec.j2                   | 2 +-
 openstack/debtcollector/debtcollector.spec.j2           | 2 +-
 openstack/glance/glance.spec.j2                         | 1 +
 openstack/ironic-lib/ironic-lib.spec.j2                 | 4 +++-
 openstack/nova/nova.spec.j2                             | 2 ++
 openstack/openstackdocstheme/openstackdocstheme.spec.j2 | 2 +-
 openstack/os-brick/os-brick.spec.j2                     | 6 +++---
 openstack/oslo.cache/oslo.cache.spec.j2                 | 2 +-
 openstack/oslo.log/oslo.log.spec.j2                     | 2 +-
 openstack/tooz/tooz.spec.j2                             | 2 +-
 10 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/openstack/castellan/castellan.spec.j2 b/openstack/castellan/castellan.spec.j2
index b88088bfc..b14b3546c 100644
--- a/openstack/castellan/castellan.spec.j2
+++ b/openstack/castellan/castellan.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'castellan' %}
-{% set upstream_version = upstream_version('3.0.1') %}
+{% set upstream_version = upstream_version('3.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/debtcollector/debtcollector.spec.j2 b/openstack/debtcollector/debtcollector.spec.j2
index b7654292f..0eb4c835e 100644
--- a/openstack/debtcollector/debtcollector.spec.j2
+++ b/openstack/debtcollector/debtcollector.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'debtcollector' %}
-{% set upstream_version = upstream_version('2.0.1') %}
+{% set upstream_version = upstream_version('2.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/glance/glance.spec.j2 b/openstack/glance/glance.spec.j2
index 9fb3111d9..73ee87afc 100644
--- a/openstack/glance/glance.spec.j2
+++ b/openstack/glance/glance.spec.j2
@@ -50,6 +50,7 @@ BuildRequires:  {{ py3('oslo.utils') }}
 BuildRequires:  {{ py3('oslotest') }}
 BuildRequires:  {{ py3('osprofiler') }}
 BuildRequires:  {{ py3('pyOpenSSL') }}
+BuildRequires:  {{ py3('retrying') }}
 BuildRequires:  {{ py3('sqlparse') }}
 BuildRequires:  {{ py3('stestr') }}
 BuildRequires:  {{ py3('stevedore') }}
diff --git a/openstack/ironic-lib/ironic-lib.spec.j2 b/openstack/ironic-lib/ironic-lib.spec.j2
index fb973d018..cde9104c6 100644
--- a/openstack/ironic-lib/ironic-lib.spec.j2
+++ b/openstack/ironic-lib/ironic-lib.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'ironic-lib' %}
-{% set upstream_version = upstream_version('4.2.0') %}
+{% set upstream_version = upstream_version('4.3.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -12,6 +12,7 @@ Group:          Development/Languages/Python
 URL:            https://docs.openstack.org/developer/ironic-lib/
 Source0:        https://files.pythonhosted.org/packages/source/i/ironic-lib/ironic-lib-%{version}.tar.gz
 BuildRequires:  openstack-macros
+BuildRequires:  {{ py3('bcrypt') }}
 BuildRequires:  {{ py3('mock') }}
 BuildRequires:  {{ py3('oslo.concurrency') }}
 BuildRequires:  {{ py3('oslo.log') }}
@@ -21,6 +22,7 @@ BuildRequires:  {{ py3('pbr') }}
 BuildRequires:  {{ py3('setuptools') }}
 BuildRequires:  {{ py3('stestr') }}
 BuildRequires:  {{ py3('zeroconf') }}
+Requires:       {{ py3('bcrypt') }}
 Requires:       {{ py3('eventlet') }}
 Requires:       {{ py3('oslo.concurrency') }}
 Requires:       {{ py3('oslo.config') }}
diff --git a/openstack/nova/nova.spec.j2 b/openstack/nova/nova.spec.j2
index 9425ad9f2..02053c781 100644
--- a/openstack/nova/nova.spec.j2
+++ b/openstack/nova/nova.spec.j2
@@ -81,6 +81,7 @@ BuildRequires:  {{ py3('paramiko') }}
 BuildRequires:  {{ py3('psycopg2') }}
 BuildRequires:  {{ py3('python-subunit') }}
 BuildRequires:  {{ py3('requests-mock') }}
+BuildRequires:  {{ py3('retrying') }}
 BuildRequires:  {{ py3('testrepository') }}
 BuildRequires:  {{ py3('testresources') }}
 BuildRequires:  {{ py3('testscenarios') }}
@@ -172,6 +173,7 @@ Requires:       {{ py3('paramiko') }}
 Requires:       {{ py3('pbr') }}
 Requires:       {{ py3('psutil') }}
 Requires:       {{ py3('requests') }}
+Requires:       {{ py3('retrying') }}
 Requires:       {{ py3('rfc3986') }}
 Requires:       {{ py3('setuptools') }}
 Requires:       {{ py3('six') }}
diff --git a/openstack/openstackdocstheme/openstackdocstheme.spec.j2 b/openstack/openstackdocstheme/openstackdocstheme.spec.j2
index 275a0bec8..7dab60f9f 100644
--- a/openstack/openstackdocstheme/openstackdocstheme.spec.j2
+++ b/openstack/openstackdocstheme/openstackdocstheme.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'openstackdocstheme' %}
-{% set upstream_version = upstream_version('2.0.2') %}
+{% set upstream_version = upstream_version('2.2.2') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/os-brick/os-brick.spec.j2 b/openstack/os-brick/os-brick.spec.j2
index a46bcfd60..240e4e26a 100644
--- a/openstack/os-brick/os-brick.spec.j2
+++ b/openstack/os-brick/os-brick.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'os-brick' %}
-{% set upstream_version = upstream_version('3.0.2') %}
+{% set upstream_version = upstream_version('3.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 # NOTE(ykarel): This is required to prevent singlespec macros from changing the requires
@@ -30,10 +30,10 @@ BuildRequires:  {{ py3('pbr') }}
 BuildRequires:  {{ py3('python-subunit') }}
 BuildRequires:  {{ py3('reno') }}
 BuildRequires:  {{ py3('requests') }}
-BuildRequires:  {{ py3('retrying') }}
 BuildRequires:  {{ py3('setuptools') }}
 BuildRequires:  {{ py3('six') }}
 BuildRequires:  {{ py3('stestr') }}
+BuildRequires:  {{ py3('tenacity') }}
 BuildRequires:  {{ py3('testscenarios') }}
 BuildRequires:  {{ py3('testtools') }}
 BuildArch:      noarch
@@ -57,8 +57,8 @@ Requires:       {{ py3('oslo.privsep') }}
 Requires:       {{ py3('oslo.service') }}
 Requires:       {{ py3('oslo.utils') }}
 Requires:       {{ py3('requests') }}
-Requires:       {{ py3('retrying') }}
 Requires:       {{ py3('six') }}
+Requires:       {{ py3('tenacity') }}
 
 %description -n python3-os-brick
 OpenStack Cinder brick library for managing local volume attaches.
diff --git a/openstack/oslo.cache/oslo.cache.spec.j2 b/openstack/oslo.cache/oslo.cache.spec.j2
index fbc8d5d4e..8ba121cde 100644
--- a/openstack/oslo.cache/oslo.cache.spec.j2
+++ b/openstack/oslo.cache/oslo.cache.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'oslo.cache' %}
-{% set upstream_version = upstream_version('2.3.0') %}
+{% set upstream_version = upstream_version('2.4.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/oslo.log/oslo.log.spec.j2 b/openstack/oslo.log/oslo.log.spec.j2
index 7219a9375..17f54a350 100644
--- a/openstack/oslo.log/oslo.log.spec.j2
+++ b/openstack/oslo.log/oslo.log.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'oslo.log' %}
-{% set upstream_version = upstream_version('4.1.2') %}
+{% set upstream_version = upstream_version('4.2.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/tooz/tooz.spec.j2 b/openstack/tooz/tooz.spec.j2
index dcb51915e..97e0d8588 100644
--- a/openstack/tooz/tooz.spec.j2
+++ b/openstack/tooz/tooz.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'tooz' %}
-{% set upstream_version = upstream_version('2.3.0') %}
+{% set upstream_version = upstream_version('2.4.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}