Skip to content

Commit 7755ef6

Browse files
committed
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 (cherry picked from commit 2b599bd)
1 parent 353b561 commit 7755ef6

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

ansible/roles/nova-cell/defaults/main.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ nova_cell_services:
4040
enabled: "{{ nova_console == 'spice' }}"
4141
volumes: "{{ nova_spicehtml5proxy_default_volumes + nova_spicehtml5proxy_extra_volumes }}"
4242
dimensions: "{{ nova_spicehtml5proxy_dimensions }}"
43+
healthcheck: "{{ nova_spicehtml5proxy_healthcheck }}"
4344
nova-serialproxy:
4445
container_name: "nova_serialproxy"
4546
group: "{{ nova_cell_serialproxy_group }}"
@@ -286,6 +287,19 @@ nova_novncproxy_healthcheck:
286287
test: "{% if nova_novncproxy_enable_healthchecks | bool %}{{ nova_novncproxy_healthcheck_test }}{% else %}NONE{% endif %}"
287288
timeout: "{{ nova_novncproxy_healthcheck_timeout }}"
288289

290+
nova_spicehtml5proxy_enable_healthchecks: "{{ enable_container_healthchecks }}"
291+
nova_spicehtml5proxy_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
292+
nova_spicehtml5proxy_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
293+
nova_spicehtml5proxy_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
294+
nova_spicehtml5proxy_healthcheck_test: ["CMD-SHELL", "healthcheck_curl http://{{ api_interface_address | put_address_in_context('url') }}:{{ nova_spicehtml5proxy_listen_port }}/spice_auto.html"]
295+
nova_spicehtml5proxy_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
296+
nova_spicehtml5proxy_healthcheck:
297+
interval: "{{ nova_spicehtml5proxy_healthcheck_interval }}"
298+
retries: "{{ nova_spicehtml5proxy_healthcheck_retries }}"
299+
start_period: "{{ nova_spicehtml5proxy_healthcheck_start_period }}"
300+
test: "{% if nova_spicehtml5proxy_enable_healthchecks | bool %}{{ nova_spicehtml5proxy_healthcheck_test }}{% else %}NONE{% endif %}"
301+
timeout: "{{ nova_spicehtml5proxy_healthcheck_timeout }}"
302+
289303
nova_conductor_enable_healthchecks: "{{ enable_container_healthchecks }}"
290304
nova_conductor_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
291305
nova_conductor_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
features:
3+
- |
4+
Implements container healthchecks for nova-spicehtml5proxy service.
5+
See `blueprint
6+
<https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__

0 commit comments

Comments
 (0)