diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 4535ae0f405a0d2722a0e9d42720d337285ced6c..3de1a5e2a56f3b515c3ef412f676461d5d992033 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -173,6 +173,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 @@ -420,6 +421,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" diff --git a/ansible/roles/neutron/defaults/releasenotes/notes/implement-docker-healthchecks-for-ironic-neutron-agent-61ec4d0d237da075.yaml b/ansible/roles/neutron/defaults/releasenotes/notes/implement-docker-healthchecks-for-ironic-neutron-agent-61ec4d0d237da075.yaml new file mode 100644 index 0000000000000000000000000000000000000000..c20ce774b7f36b37acca55d4d43b21700588f222 --- /dev/null +++ b/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>`__