From 2b599bdb83dd849927eccbb934db5badd7954af0 Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Thu, 12 Aug 2021 16:19:09 +0200 Subject: [PATCH] Use Docker healthchecks for nova-spicehtml5proxy service This change enables the use of Docker healthchecks for nova-spicehtml5proxy service. Implements: blueprint container-health-check Change-Id: I584c588c20781e6c6567429811aecf97967baea3 --- ansible/roles/nova-cell/defaults/main.yml | 14 ++++++++++++++ ...-for-nova-spicehtml5proxy-a9cf93c15c0a8966.yaml | 6 ++++++ 2 files changed, 20 insertions(+) create mode 100644 releasenotes/notes/implement-docker-healthchecks-for-nova-spicehtml5proxy-a9cf93c15c0a8966.yaml diff --git a/ansible/roles/nova-cell/defaults/main.yml b/ansible/roles/nova-cell/defaults/main.yml index bf8c23a07a..4e0dc54688 100644 --- a/ansible/roles/nova-cell/defaults/main.yml +++ b/ansible/roles/nova-cell/defaults/main.yml @@ -40,6 +40,7 @@ nova_cell_services: enabled: "{{ nova_console == 'spice' }}" volumes: "{{ nova_spicehtml5proxy_default_volumes + nova_spicehtml5proxy_extra_volumes }}" dimensions: "{{ nova_spicehtml5proxy_dimensions }}" + healthcheck: "{{ nova_spicehtml5proxy_healthcheck }}" nova-serialproxy: container_name: "nova_serialproxy" group: "{{ nova_cell_serialproxy_group }}" @@ -286,6 +287,19 @@ nova_novncproxy_healthcheck: test: "{% if nova_novncproxy_enable_healthchecks | bool %}{{ nova_novncproxy_healthcheck_test }}{% else %}NONE{% endif %}" timeout: "{{ nova_novncproxy_healthcheck_timeout }}" +nova_spicehtml5proxy_enable_healthchecks: "{{ enable_container_healthchecks }}" +nova_spicehtml5proxy_healthcheck_interval: "{{ default_container_healthcheck_interval }}" +nova_spicehtml5proxy_healthcheck_retries: "{{ default_container_healthcheck_retries }}" +nova_spicehtml5proxy_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}" +nova_spicehtml5proxy_healthcheck_test: ["CMD-SHELL", "healthcheck_curl http://{{ api_interface_address | put_address_in_context('url') }}:{{ nova_spicehtml5proxy_listen_port }}/spice_auto.html"] +nova_spicehtml5proxy_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}" +nova_spicehtml5proxy_healthcheck: + interval: "{{ nova_spicehtml5proxy_healthcheck_interval }}" + retries: "{{ nova_spicehtml5proxy_healthcheck_retries }}" + start_period: "{{ nova_spicehtml5proxy_healthcheck_start_period }}" + test: "{% if nova_spicehtml5proxy_enable_healthchecks | bool %}{{ nova_spicehtml5proxy_healthcheck_test }}{% else %}NONE{% endif %}" + timeout: "{{ nova_spicehtml5proxy_healthcheck_timeout }}" + nova_conductor_enable_healthchecks: "{{ enable_container_healthchecks }}" nova_conductor_healthcheck_interval: "{{ default_container_healthcheck_interval }}" nova_conductor_healthcheck_retries: "{{ default_container_healthcheck_retries }}" diff --git a/releasenotes/notes/implement-docker-healthchecks-for-nova-spicehtml5proxy-a9cf93c15c0a8966.yaml b/releasenotes/notes/implement-docker-healthchecks-for-nova-spicehtml5proxy-a9cf93c15c0a8966.yaml new file mode 100644 index 0000000000..b788a4201b --- /dev/null +++ b/releasenotes/notes/implement-docker-healthchecks-for-nova-spicehtml5proxy-a9cf93c15c0a8966.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Implements container healthchecks for nova-spicehtml5proxy service. + See `blueprint + `__