Merge "Use Docker healthchecks for ironic-neutron-agent services" into stable/wallaby

Author: Zuul

ansible/roles/neutron/defaults/main.yml

@@ -172,6 +172,7 @@ neutron_services:
     host_in_groups: "{{ inventory_hostname in groups['ironic-neutron-agent'] }}"
     volumes: "{{ ironic_neutron_agent_default_volumes + ironic_neutron_agent_extra_volumes }}"
     dimensions: "{{ ironic_neutron_agent_dimensions }}"
+    healthcheck: "{{ ironic_neutron_agent_healthcheck }}"
   neutron-tls-proxy:
     container_name: neutron_tls_proxy
     group: neutron-server
@@ -406,6 +407,19 @@ neutron_sriov_agent_healthcheck:
   test: "{% if neutron_sriov_agent_enable_healthchecks | bool %}{{ neutron_sriov_agent_healthcheck_test }}{% else %}NONE{% endif %}"
   timeout: "{{ neutron_sriov_agent_healthcheck_timeout }}"
 
+ironic_neutron_agent_enable_healthchecks: "{{ enable_container_healthchecks }}"
+ironic_neutron_agent_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
+ironic_neutron_agent_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
+ironic_neutron_agent_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
+ironic_neutron_agent_healthcheck_test: ["CMD-SHELL", "healthcheck_port ironic-neutron-agent {{ om_rpc_port }}"]
+ironic_neutron_agent_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
+ironic_neutron_agent_healthcheck:
+  interval: "{{ ironic_neutron_agent_healthcheck_interval }}"
+  retries: "{{ ironic_neutron_agent_healthcheck_retries }}"
+  start_period: "{{ ironic_neutron_agent_healthcheck_start_period }}"
+  test: "{% if ironic_neutron_agent_enable_healthchecks | bool %}{{ ironic_neutron_agent_healthcheck_test }}{% else %}NONE{% endif %}"
+  timeout: "{{ ironic_neutron_agent_healthcheck_timeout }}"
+
 neutron_dhcp_agent_default_volumes:
   - "{{ node_config_directory }}/neutron-dhcp-agent/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"

ansible/roles/neutron/defaults/releasenotes/notes/implement-docker-healthchecks-for-ironic-neutron-agent-61ec4d0d237da075.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Implements container healthchecks for ironic-neutron-agent service.
+    See `blueprint
+    <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__