Skip to content

Commit 30d23f3

Browse files
author
likui
committed
Use Docker healthchecks for ironic-neutron-agent services
This change enables the use of Docker healthchecks for ironic-neutron-agent services. Change-Id: I80f8319b2cf2e4ae09904a08532cde5ec0385fa3 Implements: blueprint container-health-check
1 parent 68b66a3 commit 30d23f3

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

ansible/roles/neutron/defaults/main.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ neutron_services:
172172
host_in_groups: "{{ inventory_hostname in groups['ironic-neutron-agent'] }}"
173173
volumes: "{{ ironic_neutron_agent_default_volumes + ironic_neutron_agent_extra_volumes }}"
174174
dimensions: "{{ ironic_neutron_agent_dimensions }}"
175+
healthcheck: "{{ ironic_neutron_agent_healthcheck }}"
175176
neutron-tls-proxy:
176177
container_name: neutron_tls_proxy
177178
group: neutron-server
@@ -406,6 +407,19 @@ neutron_sriov_agent_healthcheck:
406407
test: "{% if neutron_sriov_agent_enable_healthchecks | bool %}{{ neutron_sriov_agent_healthcheck_test }}{% else %}NONE{% endif %}"
407408
timeout: "{{ neutron_sriov_agent_healthcheck_timeout }}"
408409

410+
ironic_neutron_agent_enable_healthchecks: "{{ enable_container_healthchecks }}"
411+
ironic_neutron_agent_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
412+
ironic_neutron_agent_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
413+
ironic_neutron_agent_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
414+
ironic_neutron_agent_healthcheck_test: ["CMD-SHELL", "healthcheck_port ironic-neutron-agent {{ om_rpc_port }}"]
415+
ironic_neutron_agent_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
416+
ironic_neutron_agent_healthcheck:
417+
interval: "{{ ironic_neutron_agent_healthcheck_interval }}"
418+
retries: "{{ ironic_neutron_agent_healthcheck_retries }}"
419+
start_period: "{{ ironic_neutron_agent_healthcheck_start_period }}"
420+
test: "{% if ironic_neutron_agent_enable_healthchecks | bool %}{{ ironic_neutron_agent_healthcheck_test }}{% else %}NONE{% endif %}"
421+
timeout: "{{ ironic_neutron_agent_healthcheck_timeout }}"
422+
409423
neutron_dhcp_agent_default_volumes:
410424
- "{{ node_config_directory }}/neutron-dhcp-agent/:{{ container_config_directory }}/:ro"
411425
- "/etc/localtime:/etc/localtime:ro"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
features:
3+
- |
4+
Implements container healthchecks for ironic-neutron-agent service.
5+
See `blueprint
6+
<https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__

0 commit comments

Comments
 (0)