diff options
| author | Zuul <zuul@review.opendev.org> | 2024-08-28 15:50:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-08-28 15:50:58 +0000 |
| commit | e7eff35e42f8f90533898581eb5853a931d004a8 (patch) | |
| tree | 1a41610cbe828f87e817884820b49d6e5daec387 /docker | |
| parent | ece67cd2aec82d661ba355ce6bc6e41bb88001b6 (diff) | |
| parent | 423a73d9d1bf2d2b9a4c1a71848506cad4ff1319 (diff) | |
| download | kolla-e7eff35e42f8f90533898581eb5853a931d004a8.tar.gz kolla-e7eff35e42f8f90533898581eb5853a931d004a8.zip | |
Merge "Revert "Add support for checking incoming RabbitMQ version""
Diffstat (limited to 'docker')
| -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 |