[ovn/noha] Simplify net scheme on compute nodes

Also install OVS 2.9 from UCA repository to get the latest code/fixes.

Change-Id: I09d6da67d28033bc0e64eef27fffb368d262d7f4
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2
index 89ba3b0..a6b6164 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2
@@ -21,9 +21,11 @@ parameters:
         external_interface:
           enabled: true
           name: ${_param:external_interface}
-          mtu: ${_param:interface_mtu}
           proto: manual
-          type: eth
+          ovs_port_type: OVSPort
+          type: ovs_port
+          ovs_bridge: br-floating
+          bridge: br-floating
         br-mesh:
           enabled: true
           type: bridge
@@ -36,20 +38,10 @@ parameters:
           enabled: true
           type: ovs_bridge
           mtu: ${_param:interface_mtu}
-        float-to-ex:
-          enabled: true
-          type: ovs_port
-          mtu: ${_param:interface_mtu}
-          bridge: br-floating
-        br-ex:
-          enabled: true
-          type: bridge
-          mtu: ${_param:interface_mtu}
+          proto: static
           address: ${_param:external_address}
           netmask: ${_param:opnfv_net_public_mask}
           use_interfaces:
             - ${_param:external_interface}
-          use_ovs_ports:
-            - float-to-ex
           gateway: ${_param:opnfv_net_public_gw}
           name_servers: {{ nm.dns_public }}

diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml
index cba6b77..2da6a6d 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml
@@ -8,3 +8,15 @@
 ---
 classes:
   - cluster.mcp-common-noha.openstack_init
+parameters:
+  linux:
+    system:
+      repo:
+        uca:
+          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
+          key_id: EC4926EA
+          key_server: keyserver.ubuntu.com
+          pin:
+            - pin: 'release o=Canonical'
+              priority: 1200
+              package: 'openvswitch* python-openvswitch ovn*'