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

@@ -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:

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

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
 ...