openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix ironic_ipxe healthcheck on Debian/Ubuntu"

Browse Source
This commit is contained in:
Zuul 2021-07-22 11:57:08 +00:00 committed by Gerrit Code Review
commit 5d5c3921c7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/ironic/defaults/main.yml
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 }}"

6
releasenotes/notes/fix-deb-ironic-ipxe-heathcheck-2ae5fd0537c056ce.yaml Normal file
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>`__