From 07a65c9061fe34bbbd39b5247df54ae2ef8a4c5c Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 7 Jun 2022 06:58:16 +0200 Subject: Switch OPENSTACK_RELEASE back to master Cap openstacksdk in kolla-toolbox to avoid ansible-openstack-collection from failing. Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/844905 Change-Id: I4d7dcc413cd9ab0b9db550e1aed7d2229b04c5d1 --- docker/kolla-toolbox/Dockerfile.j2 | 3 +++ kolla/common/config.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 283fd77a1..618bf3719 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -62,8 +62,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% block kolla_toolbox_upper_constraints %} +{# NOTE(frickler): openstacksdk currently needs to be capped for ansible-openstack-collection #} RUN mkdir -p /requirements \ && curl -o /requirements/upper-constraints.txt ${UPPER_CONSTRAINTS_FILE:-https://releases.openstack.org/constraints/upper/{{ openstack_release }}} \ + && sed -e "/^openstacksdk/d" -i /requirements/upper-constraints.txt \ && {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages")) }} \ && virtualenv --system-site-packages {{ virtualenv_path }} {% endblock %} @@ -74,6 +76,7 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH 'ansible-core==2.11.*', 'cmd2', 'influxdb', + 'openstacksdk\<0.99.0', 'os-client-config', 'pbr', 'pymysql', diff --git a/kolla/common/config.py b/kolla/common/config.py index 78c9f2fcd..eac675eeb 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -32,7 +32,7 @@ DISTRO_PRETTY_NAME = { 'debian': 'Debian GNU/Linux 11 (bullseye)', 'ubuntu': 'Ubuntu 20.04', } -OPENSTACK_RELEASE = 'yoga' +OPENSTACK_RELEASE = 'master' # This is noarch repository so we will use it on all architectures DELOREAN = "https://trunk.rdoproject.org/centos8-yoga/" \ -- cgit v1.2.3