diff options
| author | Bartosz Bezak <bartosz@stackhpc.com> | 2024-06-04 14:23:53 +0200 |
|---|---|---|
| committer | Bartosz Bezak <bartosz@stackhpc.com> | 2024-06-06 12:41:29 +0200 |
| commit | 9f1aff9adda9376bd42b2800252e0246b4de3646 (patch) | |
| tree | 84b78db48a8778d37c95ec668a4ceaaced41b7ab | |
| parent | 3653011b0a9e00e85c07bbe0b6e226a1efaa5f33 (diff) | |
| download | kolla-9f1aff9adda9376bd42b2800252e0246b4de3646.tar.gz kolla-9f1aff9adda9376bd42b2800252e0246b4de3646.zip | |
Pin requests to <2.32 for docker sdk (2023.1 and older releases)
As 2023.1 and older releases have docker>=3.0.0,<7.0.0 we need
to pin requests to <2.32 due too [1]
Also marking collectd as unbuildable to unblock CI [2]
[1] https://github.com/docker/docker-py/issues/3256
[2] https://review.opendev.org/c/openstack/kolla/+/918962
Related-Bug: #2066364
Related-Bug: #2065362
Change-Id: Ic298d9eb9d73ee4378921e15865ec11a488f7bd0
(cherry picked from commit b5c936a3a564e10b35b0e378bd6d5034f0db93b4)
| -rw-r--r-- | kolla/image/unbuildable.py | 1 | ||||
| -rw-r--r-- | requirements.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py index 562a7db92..82d69948e 100644 --- a/kolla/image/unbuildable.py +++ b/kolla/image/unbuildable.py @@ -36,6 +36,7 @@ UNBUILDABLE_IMAGES = { }, 'rocky': { + "collectd", # Missing libpqos.so.4()(64bit) "hacluster-pcs", # Missing crmsh package "murano-base", # Missing tarball image "nova-spicehtml5proxy", # Missing spicehtml5 package diff --git a/requirements.txt b/requirements.txt index 6a56bcb1e..a9f8acb8e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 docker>=3.0.0,<7.0.0 # Apache-2.0 +requests<2.32.0 # Apache-2.0 Jinja2>=3.0.1 # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause) oslo.config>=5.1.0 # Apache-2.0 |