diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-07-06 15:26:00 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-07-06 19:59:40 +0000 |
| commit | db35ac8d793506bc43b62e7e39d27a75de1043ed (patch) | |
| tree | feec28d13a43490f5fd4260374144a1abfc20331 /docker/rabbitmq | |
| parent | 1ae1850557e3b99902f73b32c9005618537a1f2d (diff) | |
| download | kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.tar.gz kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.zip | |
Migrate to pyproject.toml
[tool.setuptools.data-files] does not support recursive directory
installation. The old setup.cfg [files] worked because PBR's
FilesConfig.expand_globs() used os.walk() to expand docker/*, but
this hook is not triggered by the pbr.build PEP-517 backend.
Move docker/ into kolla/ and use [tool.setuptools.package-data]
instead. Update kolla_worker._get_images_dir() to check the kolla
package directory first so both editable and regular installs work.
Change-Id: I4fc452c03740ef22ebbb4e8d0d86c4f4783e2d09
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker/rabbitmq')
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 69 | ||||
| -rw-r--r-- | docker/rabbitmq/apt_preferences_rabbitmq.debian | 7 | ||||
| -rw-r--r-- | docker/rabbitmq/apt_preferences_rabbitmq.ubuntu | 7 | ||||
| -rw-r--r-- | docker/rabbitmq/extend_start.sh | 26 | ||||
| -rw-r--r-- | docker/rabbitmq/healthcheck_rabbitmq | 8 |
5 files changed, 0 insertions, 117 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 deleted file mode 100644 index a167356a7..000000000 --- a/docker/rabbitmq/Dockerfile.j2 +++ /dev/null @@ -1,69 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block rabbitmq_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='rabbitmq') }} - -{{ macros.enable_extra_repos(['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' %} - -{{ macros.enable_extra_repos(['crb']) }} - - {% set rabbitmq_packages = [ - 'erlang-27.*', - 'rabbitmq-server-4.2.*' - ] %} - -{% elif base_package_type == 'deb' %} - {% set rabbitmq_packages = [ - 'logrotate', - 'rabbitmq-server', - ] %} - -{% endif %} - -{{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} - -{% endblock %} - -{% block rabbitmq_install_plugins %} - -RUN rm -rf /var/lib/rabbitmq/* \ - && mkdir -p /usr/lib/rabbitmq/plugins \ - && /usr/lib/rabbitmq/bin/rabbitmq-plugins enable --offline \ - rabbitmq_management \ - rabbitmq_prometheus - -{% endblock %} - -{% if docker_healthchecks %} -{% block healthcheck_installation %} - -COPY healthcheck_rabbitmq /usr/local/bin/healthcheck_rabbitmq -RUN chmod 755 /usr/local/bin/healthcheck_rabbitmq - -{% endblock %} -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 644 /usr/local/bin/kolla_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block rabbitmq_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER rabbitmq diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.debian b/docker/rabbitmq/apt_preferences_rabbitmq.debian deleted file mode 100644 index cc6404b3e..000000000 --- a/docker/rabbitmq/apt_preferences_rabbitmq.debian +++ /dev/null @@ -1,7 +0,0 @@ -Package: rabbitmq-server -Pin: version 4.2.* -Pin-Priority: 1000 - -Package: erlang* -Pin: version 1:27.* -Pin-Priority: 1000 diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu deleted file mode 100644 index cc6404b3e..000000000 --- a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu +++ /dev/null @@ -1,7 +0,0 @@ -Package: rabbitmq-server -Pin: version 4.2.* -Pin-Priority: 1000 - -Package: erlang* -Pin: version 1:27.* -Pin-Priority: 1000 diff --git a/docker/rabbitmq/extend_start.sh b/docker/rabbitmq/extend_start.sh deleted file mode 100644 index ef28d2b5f..000000000 --- a/docker/rabbitmq/extend_start.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -: ${RABBITMQ_LOG_DIR:=/var/log/kolla/rabbitmq} - -# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases -# of the KOLLA_BOOTSTRAP variable being set, including empty. -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - -# NOTE(sbezverk): In kubernetes environment, if this file exists from previous -# bootstrap, the system does not allow to overwrite it (it bootstrap files with -# permission denied error) but it allows to delete it and then recreate it. - if [[ -e "/var/lib/rabbitmq/.erlang.cookie" ]]; then - rm -f /var/lib/rabbitmq/.erlang.cookie - fi - echo "${RABBITMQ_CLUSTER_COOKIE}" > /var/lib/rabbitmq/.erlang.cookie - chmod 400 /var/lib/rabbitmq/.erlang.cookie - exit 0 -fi - -if [[ ! -d "${RABBITMQ_LOG_DIR}" ]]; then - mkdir -p ${RABBITMQ_LOG_DIR} -fi - -if [[ $(stat -c %a ${RABBITMQ_LOG_DIR}) != "755" ]]; then - chmod 755 ${RABBITMQ_LOG_DIR} -fi diff --git a/docker/rabbitmq/healthcheck_rabbitmq b/docker/rabbitmq/healthcheck_rabbitmq deleted file mode 100644 index 277ab098c..000000000 --- a/docker/rabbitmq/healthcheck_rabbitmq +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -e - -for check in ping status check_running check_local_alarms check_port_connectivity check_virtual_hosts; do - echo "Running rabbitmq-diagnostics $check" - rabbitmq-diagnostics -t 5 -q $check || (echo "ERROR: $check failed" && exit 1) -done |
