Add a new label for ovn and make some changes in label selection
diff --git a/charts/neutron/values.yaml b/charts/neutron/values.yaml
index 1b2c639..2349460 100644
--- a/charts/neutron/values.yaml
+++ b/charts/neutron/values.yaml
@@ -64,9 +64,6 @@
     metadata:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled
-    ovn_metadata:
-      node_selector_key: openstack-compute-node
-      node_selector_value: enabled
     l2gw:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled
@@ -80,6 +77,9 @@
   # label that can apply to both control hosts
   # and compute hosts, until we get more sophisticated
   # with our daemonset scheduling
+  ovn:
+    node_selector_key: ovn
+    node_selector_value: enabled
   ovs:
     node_selector_key: openvswitch
     node_selector_value: enabled
@@ -161,13 +161,6 @@
       sriov: {}
       l2gateway: {}
       bagpipe_bgp: {}
-      ovn:
-        libvirt:
-          pod:
-            - requireSameNode: true
-              labels:
-                application: ovn
-                component: ovn-controller
       openvswitch:
         dhcp:
           pod: