Merge pull request #329 from stackhpc/upstream/2023.1-2024-08-05

Synchronise 2023.1 with upstream

Author: priteau

doc/source/contributor/running-in-development.rst

@@ -7,23 +7,15 @@ Running Kolla Build in development
 The recommended way to run in development
 -----------------------------------------
 
-The preferred way to run kolla-build for development is using ``tox``.
-Run the following from inside the repository:
+To clone the repository and install the package
+in development mode, run the following commands:
 
-.. code-block:: console
-
-    tox -e venv -- kolla-build ...
-
-The alternative way to run in development
------------------------------------------
-
-Sometimes, developers prefer to manage their venvs themselves. This is also
-possible. Remember to install in editable mode (``-e``). Run the following from
-inside the repository:
 
 .. code-block:: console
 
+    git clone https://opendev.org/openstack/kolla.git
+    cd kolla
     python3 -m venv ~/path/to/venv
     source ~/path/to/venv/bin/activate
-    python3 -m pip install -e .
+    python3 -m pip install --editable .
     kolla-build ...

docker/base/apt_preferences.debian

@@ -1,7 +1,3 @@
-Package: rabbitmq-server
-Pin: version 3.11.*
-Pin-Priority: 1000
-
 # NOTE(hrw): we do not want backports unless requested
 Package: *
 Pin: release n=bullseye-backports

docker/base/apt_preferences.ubuntu

@@ -1,7 +1,3 @@
-Package: rabbitmq-server
-Pin: version 3.11.*
-Pin-Priority: 1000
-
 Package: *
 Pin: origin dlm.mariadb.com
 Pin-Priority: 1000

docker/kolla-toolbox/Dockerfile.j2

@@ -15,6 +15,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.enable_extra_repos(['crb', 'erlang', 'openvswitch', 'rabbitmq']) }}
 
+{% block rabbitmq_apt_preferences %}
+{% if base_package_type == 'deb' %}
+COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
+{% endif %}
+{% endblock %}
+
 {% if base_package_type == 'rpm' %}
 
     {% set kolla_toolbox_packages = [

docker/kolla-toolbox/apt_preferences_rabbitmq.debian

@@ -0,0 +1 @@
+../rabbitmq/apt_preferences_rabbitmq.debian

docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu

@@ -0,0 +1 @@
+../rabbitmq/apt_preferences_rabbitmq.debian

docker/rabbitmq/Dockerfile.j2

@@ -11,6 +11,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.enable_extra_repos(['crb', 'erlang', 'rabbitmq']) }}
 
+{% block rabbitmq_apt_preferences %}
+{% if base_package_type == 'deb' %}
+COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
+{% endif %}
+{% endblock %}
+
 {% block rabbitmq_install %}
 {% if base_package_type == 'rpm' %}
 

docker/rabbitmq/apt_preferences_rabbitmq.debian

@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 3.11.*
+Pin-Priority: 1000
+
+Package: erlang
+Pin: version 25.*
+Pin-Priority: 1000

docker/rabbitmq/apt_preferences_rabbitmq.ubuntu

@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 3.11.*
+Pin-Priority: 1000
+
+Package: erlang
+Pin: version 25.*
+Pin-Priority: 1000

releasenotes/notes/pass-rmq-preferences-into-kolla-toolbox-32d7209c4cf1f3c9.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue where kolla-toolbox will fail to build due to mismatched
+    rabbitmq-server dependencies.
+    `LP#2066171 <https://launchpad.net/bugs/2066171>`__