Merge "[ha] Add OVN scenario"

8 files changed, 37 insertions, 6 deletions

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index f08090425..99374c583 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -50,6 +50,9 @@ wait_for 3.0 "salt -I 'cinder:volume' state.sls cinder"
 
 salt -I 'neutron:server' state.sls neutron -b 1
 salt -I 'neutron:gateway' state.sls neutron.gateway
+if salt 'cmp*' match.pillar 'neutron:compute' --out yaml --static  | grep -q -e "true" ; then
+  salt -I 'neutron:compute' state.sls neutron.compute
+fi
 
 salt -I 'nova:compute' state.sls nova
 
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml
index 7afb40e52..ec3cfaf21 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml
@@ -7,6 +7,7 @@
 ##############################################################################
 ---
 classes:
+  - service.neutron.compute.ovn.single
   - cluster.mcp-common-ha.openstack_compute
   - cluster.mcp-ovn-ha.openstack.compute_pdf
   - cluster.mcp-ovn-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml
index 811957600..7f81a4ae3 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml
@@ -7,7 +7,34 @@
 ##############################################################################
 ---
 classes:
-  - system.neutron.control.openvswitch.cluster
+  - system.neutron.control.cluster
   - cluster.mcp-common-ha.openstack_interface_vcp_biport
   - cluster.mcp-common-ha.openstack_control
   - cluster.mcp-ovn-ha.infra
+parameters:
+  _param:
+    neutron_control_dvr: "False"
+    neutron_l3_ha: "False"
+    neutron_global_physnet_mtu: 1500
+    neutron_external_mtu: 1500
+    neutron_enable_qos: "False"
+    neutron_enable_vlan_aware_vms: "False"
+  neutron:
+    server:
+      global_physnet_mtu: ${_param:neutron_global_physnet_mtu}
+      l3_ha: ${_param:neutron_l3_ha}
+      dvr: ${_param:neutron_control_dvr}
+      qos: ${_param:neutron_enable_qos}
+      vlan_aware_vms: ${_param:neutron_enable_vlan_aware_vms}
+      backend:
+        engine: ovn
+        tenant_network_types: "${_param:neutron_tenant_network_types}"
+        external_mtu: ${_param:neutron_external_mtu}
+        mechanism:
+          ovn:
+            driver: ovn
+      ovn_ctl_opts:
+        db-nb-create-insecure-remote: 'yes'
+        db-sb-create-insecure-remote: 'yes'
+        db-nb-addr: ${_param:cluster_vip_address}
+        db-sb-addr: ${_param:cluster_vip_address}
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/database.yml
index b8e441a36..f0e96daa6 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/database.yml
@@ -9,4 +9,4 @@
 classes:
   - cluster.mcp-common-ha.openstack_interface_vcp_biport
   - cluster.mcp-common-ha.openstack_database
-  - cluster.mcp-ovn-ha.infra_vcp
+  - cluster.mcp-ovn-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/init.yml
index 9dbfd59a1..737af52e3 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/init.yml
@@ -10,4 +10,4 @@ classes:
   - cluster.mcp-common-ha.openstack_init
 parameters:
   _param:
-    neutron_tenant_network_types: "flat,vxlan"
+    neutron_tenant_network_types: "geneve,flat"
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/message_queue.yml
index de0561d31..9b2f5c1c0 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/message_queue.yml
@@ -9,4 +9,4 @@
 classes:
   - cluster.mcp-common-ha.openstack_interface_vcp_biport
   - cluster.mcp-common-ha.openstack_message_queue
-  - cluster.mcp-ovn-ha.infra_vcp
+  - cluster.mcp-ovn-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/proxy.yml
index 95b78758c..3979af548 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/proxy.yml
@@ -9,4 +9,4 @@
 classes:
   - cluster.mcp-common-ha.openstack_interface_vcp_triport
   - cluster.mcp-common-ha.openstack_proxy
-  - cluster.mcp-ovn-ha.infra_vcp
+  - cluster.mcp-ovn-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/telemetry.yml
index eb7910faa..aee142c43 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/telemetry.yml
@@ -9,4 +9,4 @@
 classes:
   - cluster.mcp-common-ha.openstack_interface_vcp_biport
   - cluster.mcp-common-ha.openstack_telemetry
-  - cluster.mcp-ovn-ha.infra_vcp
+  - cluster.mcp-ovn-ha.infra.init_vcp