Merge pull request #317 from stackhpc/upstream/zed-2024-06-10

Synchronise zed with upstream
stackhpc · Jun 10, 2024 · 742b77c · 742b77c
2 parents 4cf40ab + 9f1aff9
commit 742b77c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py
@@ -36,6 +36,7 @@
     },
 
     '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
@@ -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