Merge "Only enable OVN VIPs when ml2.ovn plugin is used"

inventory/env.d/neutron.yml

@@ -41,12 +41,6 @@ component_skel:
   neutron_metadata_agent:
     belongs_to:
       - neutron_all
-  neutron_ovn_controller:
-    belongs_to:
-      - neutron_all
-  neutron_ovn_northd:
-    belongs_to:
-      - neutron_all
   neutron_sriov_nic_agent:
     belongs_to:
       - neutron_all
@@ -74,11 +68,6 @@ container_skel:
       - neutron_sriov_nic_agent
     properties:
       is_metal: true
-  neutron_ovn_northd_container:
-    belongs_to:
-      - network_containers
-    contains:
-      - neutron_ovn_northd
   neutron_server_container:
     belongs_to:
       - network_containers

inventory/env.d/nova.yml

@@ -59,7 +59,6 @@ container_skel:
     contains:
       - neutron_linuxbridge_agent
       - neutron_openvswitch_agent
-      - neutron_ovn_controller
       - neutron_sriov_nic_agent
       - nova_compute
     properties:

inventory/group_vars/haproxy/haproxy.yml

@@ -358,7 +358,7 @@ haproxy_default_services:
       haproxy_timeout_server: 90m
       haproxy_backend_options:
         - tcpka
-      haproxy_service_enabled: "{{ groups['neutron_ovn_northd'] is defined and groups['neutron_ovn_northd'] | length > 0 }}"
+      haproxy_service_enabled: "{{ (neutron_plugin_type == 'ml2.ovn') and (groups['neutron_ovn_northd'] is defined and groups['neutron_ovn_northd'] | length > 0) }}"
   - service:
       haproxy_service_name: neutron_ovn_northd_southbound
       haproxy_backend_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[:1] }}"
@@ -370,7 +370,7 @@ haproxy_default_services:
       haproxy_timeout_server: 90m
       haproxy_backend_options:
         - tcpka
-      haproxy_service_enabled: "{{ groups['neutron_ovn_northd'] is defined and groups['neutron_ovn_northd'] | length > 0 }}"
+      haproxy_service_enabled: "{{ (neutron_plugin_type == 'ml2.ovn') and (groups['neutron_ovn_northd'] is defined and groups['neutron_ovn_northd'] | length > 0) }}"
   - service:
       haproxy_service_name: neutron_ovn_ovsdb_server
       haproxy_backend_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[:1] }}"
@@ -382,4 +382,4 @@ haproxy_default_services:
       haproxy_timeout_server: 90m
       haproxy_backend_options:
         - tcpka
-      haproxy_service_enabled: "{{ groups['neutron_ovn_northd'] is defined and groups['neutron_ovn_northd'] | length > 0 }}"
+      haproxy_service_enabled: "{{ (neutron_plugin_type == 'ml2.ovn') and (groups['neutron_ovn_northd'] is defined and groups['neutron_ovn_northd'] | length > 0) }}"

tests/test_inventory.py

@@ -340,9 +340,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'neutron_metadata_agent',
         'neutron_metering_agent',
         'neutron_openvswitch_agent',
-        'neutron_ovn_controller',
-        'neutron_ovn_northd',
-        'neutron_ovn_northd_container',
         'neutron_sriov_nic_agent',
         'neutron_server',
         'neutron_server_container',