Use Docker healthchecks for rabbitmq services
This change enables the use of Docker healthchecks for rabbitmq services. Implements: blueprint container-health-check Depends-On: https://review.opendev.org/c/openstack/kolla/+/784562 Change-Id: I23a2c2efab858b9ed39c6ce0ec4a82df10e7f93d
This commit is contained in:
parent
09fcfe8cd2
commit
1ddef85973
@ -18,6 +18,7 @@ rabbitmq_services:
|
|||||||
RABBITMQ_LOG_DIR: "/var/log/kolla/{{ project_name }}"
|
RABBITMQ_LOG_DIR: "/var/log/kolla/{{ project_name }}"
|
||||||
volumes: "{{ rabbitmq_default_volumes + rabbitmq_extra_volumes }}"
|
volumes: "{{ rabbitmq_default_volumes + rabbitmq_extra_volumes }}"
|
||||||
dimensions: "{{ rabbitmq_dimensions }}"
|
dimensions: "{{ rabbitmq_dimensions }}"
|
||||||
|
healthcheck: "{{ rabbitmq_healthcheck }}"
|
||||||
haproxy:
|
haproxy:
|
||||||
rabbitmq_management:
|
rabbitmq_management:
|
||||||
enabled: "{{ enable_rabbitmq }}"
|
enabled: "{{ enable_rabbitmq }}"
|
||||||
@ -56,6 +57,19 @@ rabbitmq_tag: "{{ openstack_tag }}"
|
|||||||
rabbitmq_image_full: "{{ rabbitmq_image }}:{{ rabbitmq_tag }}"
|
rabbitmq_image_full: "{{ rabbitmq_image }}:{{ rabbitmq_tag }}"
|
||||||
rabbitmq_dimensions: "{{ default_container_dimensions }}"
|
rabbitmq_dimensions: "{{ default_container_dimensions }}"
|
||||||
|
|
||||||
|
rabbitmq_enable_healthchecks: "{{ enable_container_healthchecks }}"
|
||||||
|
rabbitmq_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
|
||||||
|
rabbitmq_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
|
||||||
|
rabbitmq_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
|
||||||
|
rabbitmq_healthcheck_test: ["CMD-SHELL", "healthcheck_rabbitmq"]
|
||||||
|
rabbitmq_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
|
||||||
|
rabbitmq_healthcheck:
|
||||||
|
interval: "{{ rabbitmq_healthcheck_interval }}"
|
||||||
|
retries: "{{ rabbitmq_healthcheck_retries }}"
|
||||||
|
start_period: "{{ rabbitmq_healthcheck_start_period }}"
|
||||||
|
test: "{% if rabbitmq_enable_healthchecks | bool %}{{ rabbitmq_healthcheck_test }}{% else %}NONE{% endif %}"
|
||||||
|
timeout: "{{ rabbitmq_healthcheck_timeout }}"
|
||||||
|
|
||||||
rabbitmq_default_volumes:
|
rabbitmq_default_volumes:
|
||||||
- "{{ node_config_directory }}/{{ project_name }}/:{{ container_config_directory }}/:ro"
|
- "{{ node_config_directory }}/{{ project_name }}/:{{ container_config_directory }}/:ro"
|
||||||
- "/etc/localtime:/etc/localtime:ro"
|
- "/etc/localtime:/etc/localtime:ro"
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
volumes: "{{ item.value.volumes }}"
|
volumes: "{{ item.value.volumes }}"
|
||||||
environment: "{{ item.value.environment }}"
|
environment: "{{ item.value.environment }}"
|
||||||
dimensions: "{{ item.value.dimensions }}"
|
dimensions: "{{ item.value.dimensions }}"
|
||||||
|
healthcheck: "{{ item.value.healthcheck | default(omit) }}"
|
||||||
when:
|
when:
|
||||||
- inventory_hostname in groups[item.value.group]
|
- inventory_hostname in groups[item.value.group]
|
||||||
- item.value.enabled | bool
|
- item.value.enabled | bool
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
volumes: "{{ service.volumes }}"
|
volumes: "{{ service.volumes }}"
|
||||||
environment: "{{ service.environment }}"
|
environment: "{{ service.environment }}"
|
||||||
dimensions: "{{ service.dimensions }}"
|
dimensions: "{{ service.dimensions }}"
|
||||||
|
healthcheck: "{{ service.healthcheck | default(omit) }}"
|
||||||
|
|
||||||
- name: Waiting for rabbitmq to start
|
- name: Waiting for rabbitmq to start
|
||||||
vars:
|
vars:
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Implements container healthchecks for rabbitmq services.
|
||||||
|
See `blueprint
|
||||||
|
<https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
|
Loading…
Reference in New Issue
Block a user