From 352b7fce8d71de404ee53019144b9ab15e8bf539 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 18 Mar 2026 14:56:27 +0100 Subject: Switch to Gazpacho/2026.1 sources Change-Id: I9b6eba0c55fa9914e8db3576127f7d53c13e97d5 Signed-off-by: Michal Nasiadka --- docker/kolla-toolbox/Dockerfile.j2 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 5f147cd2c..c730c5566 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -62,12 +62,16 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }} {% block kolla_toolbox_pip_conf %} -ENV UPPER_CONSTRAINTS_FILE=https://releases.openstack.org/constraints/upper/{{ openstack_release }} +ENV UPPER_CONSTRAINTS_FILE=/requirements/upper-constraints.txt {% endblock %} {% block kolla_toolbox_upper_constraints %} -RUN mkdir -p /requirements \ - && curl -o /requirements/upper-constraints.txt $UPPER_CONSTRAINTS_FILE \ +ADD kolla-toolbox-archive /kolla-toolbox-source + +RUN case "$UPPER_CONSTRAINTS_FILE" in \ + http*) mkdir -p /requirements && curl -LO $UPPER_CONSTRAINTS_FILE /requirements/upper-constraints.txt ;; \ + *) ln -s kolla-toolbox-source/* /requirements ;; \ + esac \ && {{ macros.upper_constraints_remove("openstacksdk") }} \ && python3 -m venv --system-site-packages {{ venv_path }} \ && KOLLA_DISTRO_PYTHON_VERSION=$(/usr/bin/python3 -c "import sys; print('{}.{}'.format(sys.version_info.major, sys.version_info.minor))") \ -- cgit v1.2.3