openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use Docker healthchecks for kuryr services"

Browse Source
This commit is contained in:
Zuul 2021-08-06 14:04:53 +00:00 committed by Gerrit Code Review
commit caf763f7c3
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ansible/roles/kuryr/defaults/main.yml
View File

@ -19,6 +19,7 @@ kuryr_services:
- NET_ADMIN - NET_ADMIN
volumes: "{{ kuryr_default_volumes + kuryr_extra_volumes }}" volumes: "{{ kuryr_default_volumes + kuryr_extra_volumes }}"
dimensions: "{{ kuryr_dimensions }}" dimensions: "{{ kuryr_dimensions }}"
healthcheck: "{{ kuryr_healthcheck }}"
#################### ####################
@ -29,6 +30,19 @@ kuryr_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_na
kuryr_tag: "{{ openstack_tag }}" kuryr_tag: "{{ openstack_tag }}"
kuryr_image_full: "{{ kuryr_image }}:{{ kuryr_tag }}" kuryr_image_full: "{{ kuryr_image }}:{{ kuryr_tag }}"
kuryr_enable_healthchecks: "{{ enable_container_healthchecks }}"
kuryr_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
kuryr_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
kuryr_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
kuryr_healthcheck_test: ["CMD-SHELL", "healthcheck_listen kuryr-server {{ kuryr_port }}"]
kuryr_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
kuryr_healthcheck:
interval: "{{ kuryr_healthcheck_interval }}"
retries: "{{ kuryr_healthcheck_retries }}"
start_period: "{{ kuryr_healthcheck_start_period }}"
test: "{% if kuryr_enable_healthchecks | bool %}{{ kuryr_healthcheck_test }}{% else %}NONE{% endif %}"
timeout: "{{ kuryr_healthcheck_timeout }}"
kuryr_default_volumes: kuryr_default_volumes:
- "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"

1
ansible/roles/kuryr/handlers/main.yml
View File

@ -13,5 +13,6 @@
cap_add: "{{ service.cap_add }}" cap_add: "{{ service.cap_add }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}"
when: when:
- kolla_action != "config" - kolla_action != "config"

1
ansible/roles/kuryr/tasks/check-containers.yml
View File

@ -10,6 +10,7 @@
cap_add: "{{ item.value.cap_add }}" cap_add: "{{ item.value.cap_add }}"
volumes: "{{ item.value.volumes }}" volumes: "{{ item.value.volumes }}"
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

6
releasenotes/notes/implement-docker-healthchecks-for-kuryr-9cc3d0480e9fe505.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Implements container healthchecks for zun services.
See `blueprint
<https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__