From ad101bc0967caad531cc82334adc16c7ed36c88b Mon Sep 17 00:00:00 2001
From: Bartosz Bezak <bartosz@stackhpc.com>
Date: Tue, 4 Jun 2024 14:23:53 +0200
Subject: [PATCH] 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],
furthermore dropping centos8 CI jobs, as it went EOL.

[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)
---
 .zuul.d/centos.yaml  | 35 -----------------------------------
 kolla/image/build.py |  1 +
 requirements.txt     |  1 +
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
index 9fe21bebe9..5a11149860 100644
--- a/.zuul.d/centos.yaml
+++ b/.zuul.d/centos.yaml
@@ -2,49 +2,14 @@
 - project:
     check:
       jobs:
-        - kolla-build-centos8s-binary
-        - kolla-build-centos8s-source
         - kolla-build-centos9s-source
-        - kolla-ansible-centos8s-source
-        - kolla-ansible-centos8s-binary
         - kolla-ansible-centos9s-source
     check-arm64:
       jobs:
-        - kolla-build-centos8s-source-aarch64
         - kolla-build-centos9s-source-aarch64
-    gate:
-      jobs:
-        - kolla-build-centos8s-source
-        - kolla-ansible-centos8s-source
     experimental:
       jobs:
-        - kolla-build-no-infra-wheels-centos8s-source
         - kolla-build-no-infra-wheels-centos9s-source
-        - kolla-ansible-centos8s-source-bifrost:
-            files: ^docker\/(base|bifrost|openstack-base)\/.*
-        # Test rabbitmq & mariadb changes in multinode ceph jobs.
-        - kolla-ansible-centos8s-source-cephadm:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
-        - kolla-ansible-centos8s-source-zun:
-            files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
-        - kolla-ansible-centos8s-source-scenario-nfv:
-            files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.*
-        - kolla-ansible-centos8s-source-ironic:
-            files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
-        - kolla-ansible-centos8s-source-swift:
-            files: ^docker/(base|openstack-base|glance|swift)/
-        - kolla-ansible-centos8s-source-mariadb:
-            files: ^docker/(base|mariadb)/
-        - kolla-ansible-centos8s-source-masakari:
-            files: ^docker/(base|masakari)/
-        - kolla-ansible-centos8s-source-octavia:
-            files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/
-        - kolla-ansible-centos8s-source-ovn:
-            files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
-        - kolla-ansible-centos8s-source-prometheus-efk:
-            files: ^docker/(base|elasticsearch|fluentd|grafana|kibana|prometheus)/
-        - kolla-ansible-centos8s-source-kvm:
-            files: ^docker/nova/
 
 - job:
     name: kolla-build-centos8s-binary
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 8a8e2d0b02..d284381c28 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -131,6 +131,7 @@ class Status(Enum):
     },
 
     'rocky': {
+        "collectd",              # Missing libpqos.so.4()(64bit)
         "elasticsearch",         # SHA1 gpg key
         "elasticsearch-curator",
         "hacluster-pcs",         # Missing crmsh package
diff --git a/requirements.txt b/requirements.txt
index 6b9078a32c..782afc5152 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 docker>=2.4.2,<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