Fix ironic_ipxe healthcheck on Debian/Ubuntu

The healthcheck checks for a process called httpd, but these distros
call it apache2.  This results in the ironic_ipxe container being marked
as unhealthy.

This change fixes the issue by making the process name distro dependent.

Change-Id: I0b0126e3071146e7f8593ba970ecbed65b36fcfa
Closes-Bug: #1937037
This commit is contained in:
Mark Goddard 2021-07-21 10:02:35 +01:00
parent e63d985ccb
commit aa28675ca9
2 changed files with 7 additions and 1 deletions

View File

@ -170,7 +170,7 @@ ironic_ipxe_enable_healthchecks: "{{ enable_container_healthchecks }}"
ironic_ipxe_healthcheck_interval: "{{ default_container_healthcheck_interval }}" ironic_ipxe_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
ironic_ipxe_healthcheck_retries: "{{ default_container_healthcheck_retries }}" ironic_ipxe_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
ironic_ipxe_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}" ironic_ipxe_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
ironic_ipxe_healthcheck_test: ["CMD-SHELL", "healthcheck_listen httpd {{ ironic_ipxe_port }}"] ironic_ipxe_healthcheck_test: ["CMD-SHELL", "healthcheck_listen {% if kolla_base_distro in ['debian', 'ubuntu'] %}apache2{% else %}httpd{% endif %} {{ ironic_ipxe_port }}"]
ironic_ipxe_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}" ironic_ipxe_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
ironic_ipxe_healthcheck: ironic_ipxe_healthcheck:
interval: "{{ ironic_ipxe_healthcheck_interval }}" interval: "{{ ironic_ipxe_healthcheck_interval }}"

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes the container health check for the ``ironic_ipxe`` container on
Debian and Ubuntu systems. `LP#1937037
<https://bugs.launchpad.net/kolla-ansible/+bug/1937037>`__