diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-03-18 14:56:27 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-03-26 10:19:07 +0000 |
| commit | 352b7fce8d71de404ee53019144b9ab15e8bf539 (patch) | |
| tree | bf303605a0edf907f168575d09fcce1de857ce1a | |
| parent | 4dd97a9d56f31ed3e109496e96e208c75d82d818 (diff) | |
| download | kolla-352b7fce8d71de404ee53019144b9ab15e8bf539.tar.gz kolla-352b7fce8d71de404ee53019144b9ab15e8bf539.zip | |
Switch to Gazpacho/2026.1 sources
Change-Id: I9b6eba0c55fa9914e8db3576127f7d53c13e97d5
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | kolla/common/config.py | 5 | ||||
| -rw-r--r-- | kolla/common/sources.py | 4 |
3 files changed, 13 insertions, 6 deletions
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))") \ diff --git a/kolla/common/config.py b/kolla/common/config.py index ee975f622..d66221af1 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -38,9 +38,8 @@ DISTRO_PRETTY_NAME = { 'ubuntu': 'Ubuntu 24.04.* LTS', } -OPENSTACK_RELEASE = 'master' -# NOTE(mnasiadka): Using Flamingo here until Gazpacho shows up in osbpo -OPENSTACK_RELEASE_CODENAME = 'Flamingo' +OPENSTACK_RELEASE = '2026.1' +OPENSTACK_RELEASE_CODENAME = 'Gazpacho' # TODO(mandre) check for file integrity instead of downloading from an HTTPS # source diff --git a/kolla/common/sources.py b/kolla/common/sources.py index fa9b12126..82a90a77e 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -156,6 +156,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/keystone/' 'keystone-${openstack_branch}.tar.gz')}, + 'kolla-toolbox': { + 'type': 'url', + 'location': ('$tarballs_base/openstack/requirements/' + 'requirements-${openstack_branch}.tar.gz')}, 'kuryr-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/kuryr/' |