Skip to content
Snippets Groups Projects
Commit 5d5c3921 authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Fix ironic_ipxe healthcheck on Debian/Ubuntu"

parents 646be658 aa28675c
No related branches found
No related tags found
No related merge requests found
...@@ -170,7 +170,7 @@ ironic_ipxe_enable_healthchecks: "{{ enable_container_healthchecks }}" ...@@ -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 }}"
......
---
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>`__
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment