Merge pull request #348 from stackhpc/upstream/2024.1-2024-09-23

Synchronise 2024.1 with upstream
stackhpc · Sep 27, 2024 · e860858 · e860858
2 parents 12d73ba + 24d1034
commit e860858
Show file tree

Hide file tree

Showing 13 changed files with 81 additions and 32 deletions.
diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst
@@ -23,14 +23,14 @@ information about package sources.
  Galera         26.4 (LTS)         `MariaDB Community downloads`_
  OpenSearch     2.x                `OpenSearch install guide`_
  ProxySQL       2.6.x              `ProxySQL repository`_
- Rabbitmq       3.10.x             - CentOS:
-                                     `Team RabbitMQ 'PackageCloud' repository`_
+ Rabbitmq       3.13.x             - CentOS/Rocky:
+                                     `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
                                    - Debian/Ubuntu:
-                                     `Team RabbitMQ 'Cloudsmith' repository`_
- Erlang         25.x               - CentOS aarch64:
+                                     `Team RabbitMQ 'Cloudsmith' repo (Deb)`_
+ Erlang         26.2.X             - CentOS/Rocky aarch64:
                                      `Hrw's COPR`_
-                                   - CentOS x86-64:
-                                     `Team RabbitMQ 'PackageCloud' repository`_
+                                   - CentOS/Rocky x86-64:
+                                     `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
                                    - Debian/Ubuntu:
                                      `Team RabbitMQ 'Modern Erlang' PPA`_
  TD Agent       4.4.x              `TreasureData install guide`_
@@ -44,9 +44,9 @@ information about package sources.
 .. _`TreasureData install guide`: https://www.fluentd.org/download
 .. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/
 
-.. _`Team RabbitMQ 'Cloudsmith' repository`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
+.. _`Team RabbitMQ 'Cloudsmith' repo (Deb)`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
 .. _`Team RabbitMQ 'Modern Erlang' PPA`: https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang
-.. _`Team RabbitMQ 'PackageCloud' repository`: https://www.rabbitmq.com/install-rpm.html#package-cloud
+.. _`Team RabbitMQ 'Cloudsmith' repo (RPM)`: https://www.rabbitmq.com/docs/install-rpm#cloudsmith
 .. _`Hrw's COPR`: https://copr.fedorainfracloud.org/coprs/hrw/erlang-for-rabbitmq/
 
 .. _`Grafana install guide`: https://grafana.com/grafana/download?platform=linux&edition=oss

diff --git a/docker/base/rabbitmq_rabbitmq-erlang.repo b/docker/base/rabbitmq_rabbitmq-erlang.repo
@@ -1,6 +1,9 @@
 [rabbitmq_rabbitmq-erlang]
 name=rabbitmq_rabbitmq-erlang
-baseurl=https://packagecloud.io/rabbitmq/erlang/el/9/$basearch
+# Use a set of mirrors maintained by the RabbitMQ core team.
+# The mirrors have significantly higher bandwidth quotas.
+baseurl=https://yum1.rabbitmq.com/erlang/el/9/$basearch
+        https://yum2.rabbitmq.com/erlang/el/9/$basearch
 gpgcheck=1
 enabled=0
-gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
+gpgkey=https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key
diff --git a/docker/base/rabbitmq_rabbitmq-server.repo b/docker/base/rabbitmq_rabbitmq-server.repo
@@ -1,6 +1,9 @@
 [rabbitmq_rabbitmq-server]
 name=rabbitmq_rabbitmq-server
-baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/9/$basearch
+baseurl=https://yum2.rabbitmq.com/rabbitmq/el/9/noarch
+        https://yum1.rabbitmq.com/rabbitmq/el/9/noarch
 gpgcheck=1
 enabled=0
-gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
+# Cloudsmith's repository key and RabbitMQ package signing key
+gpgkey=https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key
+       https://github.com/rabbitmq/signing-keys/releases/download/3.0/rabbitmq-release-signing-key.asc
diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2
@@ -10,12 +10,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if base_package_type == 'rpm' %}
     {% set cinder_backup_packages = [
         'device-mapper-multipath',
-        'nfs-utils'
+        'lsscsi',
+        'nfs-utils',
+        'sysfsutils'
     ] %}
 {% elif base_package_type == 'deb' %}
     {% set cinder_backup_packages = [
+        'lsscsi',
         'multipath-tools',
-        'nfs-common'
+        'nfs-common',
+        'sysfsutils'
     ] %}
 {% endif %}
 

diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2
@@ -9,24 +9,29 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if base_package_type == 'rpm' %}
     {% set keystone_packages = [
+        'krb5-devel',
         'mod_auth_gssapi',
     ] %}
 {% elif base_package_type == 'deb' %}
     {% set keystone_packages = [
         'libapache2-mod-auth-gssapi',
+        'libkrb5-dev',
     ] %}
 {% endif %}
 {{ macros.install_packages(keystone_packages | customizable("packages")) }}
+
+{% set keystone_pip_packages = [
+    'requests-kerberos',
+] %}
+
+RUN {{ macros.install_pip(keystone_pip_packages | customizable("pip_packages")) }}
+
 ADD plugins-archive /
 
 {% set keystone_plugins_pip_packages = [
     '/plugins/*',
-    'requests-kerberos',
 ] %}
 
-RUN echo $(ls -al /)
-
-RUN echo $(ls -al /plugins)
 
 COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
 COPY extend_start.sh /usr/local/bin/kolla_extend_start

diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2
@@ -10,7 +10,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='opensearch-dashboards', shell='/bin/bash', homedir='/usr/share/opensearch-dashboards') }}
 {{ macros.enable_extra_repos(['opensearch-dashboards']) }}
 
-{% set opensearch_dashboards_packages = ['opensearch-dashboards'] %}
+# NOTE(mgoddard): Pinning to 2.15 due to https://bugs.launchpad.net/kolla/+bug/2077319
+{% if base_package_type == 'deb' %}
+COPY apt_preferences_opensearch_dashboards /etc/apt/preferences.d/opensearch_dashboards
+{% endif %}
+
+{% if base_package_type == 'rpm' %}
+    {% set opensearch_dashboards_packages = [
+        'opensearch-dashboards-2.15.*'
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set opensearch_dashboards_packages = [
+        'opensearch-dashboards'
+    ] %}
+{% endif %}
 
 {{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }}
 

diff --git a/docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards b/docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards
@@ -0,0 +1,3 @@
+Package: opensearch-dashboards
+Pin: version 2.15.*
+Pin-Priority: 1000
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
@@ -135,7 +135,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'pika',
         'prettytable',
         'psutil',
-        '/pycadf',
+        '/plugins/pycadf*',
         'pyinotify',
         'pymysql',
         'pyngus',
@@ -184,9 +184,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 ADD openstack-base-archive /openstack-base-source
 ADD plugins-archive /
 
-RUN ln -s plugins/* /pycadf \
-    && mkdir -p /etc/pycadf \
-    && cp /pycadf/etc/pycadf/* /etc/pycadf/
+RUN mkdir -p /etc/pycadf \
+    && cp /plugins/pycadf*/etc/pycadf/* /etc/pycadf/
 
 RUN ln -s openstack-base-source/* /requirements \
 
@@ -211,9 +210,6 @@ ENV PATH /var/lib/kolla/venv/bin:$PATH
 RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools==67.2.*']) }} \
     && {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }}
 
-RUN unlink /pycadf \
-    && rm -rf plugins/*
-
 {% if base_package_type == 'rpm' %}
 RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
     && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf

diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
@@ -80,7 +80,7 @@ debian:
     component: ""
     gpg_key: "proxysql.asc"
   rabbitmq:
-    url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian"
+    url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian"
     suite: "bullseye"
     component: "main"
     gpg_key: "rabbitmq.gpg"
@@ -127,7 +127,7 @@ debian-aarch64:
     component: ""
     gpg_key: "proxysql.asc"
   rabbitmq:
-    url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian"
+    url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian"
     suite: "bullseye"
     component: "main"
     # NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not
@@ -213,7 +213,7 @@ ubuntu:
     component: ""
     gpg_key: "proxysql.asc"
   rabbitmq:
-    url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu"
+    url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu"
     suite: "jammy"
     component: "main"
     gpg_key: "rabbitmq.gpg"
@@ -260,7 +260,7 @@ ubuntu-aarch64:
     component: ""
     gpg_key: "proxysql.asc"
   rabbitmq:
-    url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu"
+    url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu"
     suite: "jammy"
     component: "main"
     arch: "amd64"

diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py
@@ -86,7 +86,7 @@ def test_enable_repos_debian_arch(self):
         }
 
         result = methods.handle_repos(template_vars, ['rabbitmq'], 'enable')
-        expectCmd = "RUN echo 'Uris: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian' "  # noqa: E501
+        expectCmd = "RUN echo 'Uris: https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' "  # noqa: E501
         expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Components: main' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
@@ -133,7 +133,7 @@ def test_enable_repos_debian_multiple(self):
         expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && "
 
         expectCmd += "echo 'Uris: "
-        expectCmd += "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian' "  # noqa: E501
+        expectCmd += "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' "  # noqa: E501
         expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Components: main' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "

diff --git a/releasenotes/notes/bug-2077319-a47a06175a589a1a.yaml b/releasenotes/notes/bug-2077319-a47a06175a589a1a.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    Fixes an `issue
+    <https://github.com/opensearch-project/OpenSearch-Dashboards/issues/7626>`__
+    in the OpenSearch Dashboards image where the discover page would hang after
+    initial deployment when there is no index pattern. This has been resolved
+    by reverting OpenSearch Dashboards to version 2.15.
+    `LP#2077319 <https://bugs.launchpad.net/kolla/+bug/2077319>`__
diff --git a/releasenotes/notes/fix-git-build-23c8fe6c4b0d92c4.yaml b/releasenotes/notes/fix-git-build-23c8fe6c4b0d92c4.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixed a bug preventing image builds when requirements are provided from
+    git type source.
+    `LP#2074075 <https://bugs.launchpad.net/kolla/+bug/2074075>`__
diff --git a/releasenotes/notes/rabbitmq-erlang-migrate-from-packagecloud-59d7e9e0a10e1da0.yaml b/releasenotes/notes/rabbitmq-erlang-migrate-from-packagecloud-59d7e9e0a10e1da0.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    RabbitMQ and Erlang packages are now all installed from the Cloudsmith
+    ``rabbitmq.com`` mirrors since the RabbitMQ ``packagecloud.io`` is getting
+    shut down August 18st, 2024:
+    https://www.rabbitmq.com/blog/2024/08/11/package-repository-updates#packagecloud-will-be-discontinued-on-aug-18th-2024