diff options
| author | Matt Crees <mattc@stackhpc.com> | 2024-08-28 11:05:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-08-28 11:05:50 +0000 |
| commit | 423a73d9d1bf2d2b9a4c1a71848506cad4ff1319 (patch) | |
| tree | 2edd4bb2a9c4a1b0b79466269dc6a14630d2f8ae | |
| parent | 36a7cd053d5b13ecc9fad1866f244a733fdd58e5 (diff) | |
| download | kolla-423a73d9d1bf2d2b9a4c1a71848506cad4ff1319.tar.gz kolla-423a73d9d1bf2d2b9a4c1a71848506cad4ff1319.zip | |
Revert "Add support for checking incoming RabbitMQ version"
This reverts commit 36a7cd053d5b13ecc9fad1866f244a733fdd58e5.
Reason for revert: feature not needed anymore, see here:
https://review.opendev.org/c/openstack/kolla-ansible/+/926146/comment/e593d721_7c48143b/
Change-Id: Ic0f9521c66240f13ff5b7fc94480dbbb76498339
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/rabbitmq/extend_start.sh | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 7c2ee2c67..266b99db1 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" version_check=true +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} {% block rabbitmq_header %}{% endblock %} diff --git a/docker/rabbitmq/extend_start.sh b/docker/rabbitmq/extend_start.sh index a6bcf116b..ef28d2b5f 100644 --- a/docker/rabbitmq/extend_start.sh +++ b/docker/rabbitmq/extend_start.sh @@ -24,8 +24,3 @@ fi if [[ $(stat -c %a ${RABBITMQ_LOG_DIR}) != "755" ]]; then chmod 755 ${RABBITMQ_LOG_DIR} fi - -if [[ "${!KOLLA_RABBITMQ_VERSION_CHECK[@]}" ]]; then - rabbitmqctl --version - exit 0 -fi |