Merge pull request #637 from stackhpc/upstream/2023.1-2024-11-04

Synchronise 2023.1 with upstream
stackhpc · Nov 4, 2024 · 9277a6c · 9277a6c
2 parents d8e3a9f + 74b41b6
commit 9277a6c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
@@ -428,7 +428,7 @@ neutron_ovn_metadata_agent_enable_healthchecks: "{{ enable_container_healthcheck
 neutron_ovn_metadata_agent_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
 neutron_ovn_metadata_agent_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
 neutron_ovn_metadata_agent_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
-neutron_ovn_metadata_agent_healthcheck_test: ["CMD-SHELL", "healthcheck_port python {{ ovn_sb_db_port }}"]
+neutron_ovn_metadata_agent_healthcheck_test: ["CMD-SHELL", "healthcheck_port neutron-ovn-metadata-agent {{ ovsdb_port }}"]
 neutron_ovn_metadata_agent_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
 neutron_ovn_metadata_agent_healthcheck:
   interval: "{{ neutron_ovn_metadata_agent_healthcheck_interval }}"
@@ -480,7 +480,7 @@ neutron_ovn_agent_enable_healthchecks: "{{ enable_container_healthchecks }}"
 neutron_ovn_agent_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
 neutron_ovn_agent_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
 neutron_ovn_agent_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
-neutron_ovn_agent_healthcheck_test: ["CMD-SHELL", "healthcheck_port python {{ ovn_sb_db_port }}"]
+neutron_ovn_agent_healthcheck_test: ["CMD-SHELL", "healthcheck_port neutron-ovn-agent {{ ovsdb_port }}"]
 neutron_ovn_agent_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
 neutron_ovn_agent_healthcheck:
   interval: "{{ neutron_ovn_agent_healthcheck_interval }}"

diff --git a/releasenotes/notes/fix_ovn_agents_hc-f6e4a39b9d64e9f1.yaml b/releasenotes/notes/fix_ovn_agents_hc-f6e4a39b9d64e9f1.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Fixes unreliable health checks for neutron_ovn_agent
+    and neutron_ovn_metadata_agent bug.
+    Changed to check OVS DB connection instead of OVN
+    southbound DB connection.
+    `LP#2084128 <https://bugs.launchpad.net/kolla-ansible/+bug/2084128>`__