fix: update ovn chart close to upstream (#2023)



Reviewed-by: Mohammed Naser <mnaser@vexxhost.com>
diff --git a/roles/defaults/vars/main.yml b/roles/defaults/vars/main.yml
index 2c48556..6fe507e 100644
--- a/roles/defaults/vars/main.yml
+++ b/roles/defaults/vars/main.yml
@@ -186,6 +186,7 @@
   openvswitch_db_server: "registry.atmosphere.dev/library/openvswitch:{{ atmosphere_release }}"
   openvswitch_vswitchd: "registry.atmosphere.dev/library/openvswitch:{{ atmosphere_release }}"
   ovn_controller: "registry.atmosphere.dev/library/ovn-host:{{ atmosphere_release }}"
+  ovn_controller_kubectl: "registry.atmosphere.dev/library/ovn-host:{{ atmosphere_release }}"
   ovn_logging_parser: "registry.atmosphere.dev/library/neutron:{{ atmosphere_release }}"
   ovn_northd: "registry.atmosphere.dev/library/ovn-central:{{ atmosphere_release }}"
   ovn_ovsdb_nb: "registry.atmosphere.dev/library/ovn-central:{{ atmosphere_release }}"
diff --git a/roles/ovn/vars/main.yml b/roles/ovn/vars/main.yml
index f03bd3b..994894f 100644
--- a/roles/ovn/vars/main.yml
+++ b/roles/ovn/vars/main.yml
@@ -25,8 +25,8 @@
     ovn_northd:
       node_selector_key: openstack-control-plane
       node_selector_value: enabled
-    ovn_controller:
-      node_selector_key: openstack-compute-node
+    ovn_controller_gw:
+      node_selector_key: openstack-control-plane
       node_selector_value: enabled
   volume:
     ovn_ovsdb_nb:
@@ -34,12 +34,6 @@
     ovn_ovsdb_sb:
       size: 20Gi
   pod:
-    labels:
-      ovn_controller_gw:
-        type: gw
-      ovn_controller:
-        type: hv
-
     replicas:
       ovn_ovsdb_nb: 3
       ovn_ovsdb_sb: 3