From 84a6df2e5d3a1c9feef9523b3ceaf3f21604e8ef Mon Sep 17 00:00:00 2001
From: liyingjun <liyingjun1988@gmail.com>
Date: Tue, 4 Apr 2023 02:27:45 +0000
Subject: [PATCH] fix(neutron): Don't check tcp socket state for ovn metadata
 agent

When using ovn as neutron plugin, the health probe failed with "RabbitMQ
sockets not Established" error, because it still check TCP connection to
Rabbitmq while OVN metadata agent doesn't use Rabbitmq. This patch adds
a condition check to avoid tcp socket state check for ovn metadata agent.

Story: #2010686
Change-Id: Ic35c1b4bb3c4d1cff7b633e6f69d5269cc23eeef
---
 neutron/Chart.yaml                         | 2 +-
 neutron/templates/bin/_health-probe.py.tpl | 5 +++--
 releasenotes/notes/neutron.yaml            | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index fdf1974d25..9b43e1f333 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 0.3.4
+version: 0.3.5
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/neutron/templates/bin/_health-probe.py.tpl b/neutron/templates/bin/_health-probe.py.tpl
index 1ba4107edb..266c3d8d3c 100644
--- a/neutron/templates/bin/_health-probe.py.tpl
+++ b/neutron/templates/bin/_health-probe.py.tpl
@@ -212,8 +212,9 @@ def test_socket_liveness():
                                           required=False))
     cfg.CONF(sys.argv[1:])
 
-    agentq = "metadata_agent"
-    tcp_socket_state_check(agentq)
+    if "ovn_metadata_agent.ini" not in ','.join(sys.argv):
+        agentq = "metadata_agent"
+        tcp_socket_state_check(agentq)
 
     try:
         metadata_proxy_socket = cfg.CONF.metadata_proxy_socket
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index ff75809111..8a2811c6b8 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -46,4 +46,5 @@ neutron:
   - 0.3.2 Use correct labels for ovs which uses one daemonset for ovs-db and ovs-vswitchd
   - 0.3.3 Add OVN Support
   - 0.3.4 Replace node-role.kubernetes.io/master with control-plane
+  - 0.3.5 Fix health probe for OVN metadata agent
 ...