Update openvswitch to 2.10

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-noha / openstack_init.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
index 54df34c..6c2c088 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
@@ -8,7 +8,7 @@
 {%- import 'net_map.j2' as nm with context %}
 ---
 classes:
-  - cluster.all-mcp-arch-common.uca_repo
+  - cluster.all-mcp-arch-common.openvswitch_210
 parameters:
   _param:
     openstack_region: RegionOne
@@ -83,13 +83,8 @@ parameters:
           net.ipv4.tcp_congestion_control: yeah
           net.ipv4.tcp_slow_start_after_idle: 0
           net.ipv4.tcp_fin_timeout: 30
-      repo:
-        uca:
-          pin:
-            - pin: 'release o=Canonical'
-              priority: 1200
-              package: 'openvswitch* python-openvswitch ovn* dpdk* libdpdk*'
 {%- if 'aarch64' in nm.cluster.arch %}
+      repo:
         armband_3:  # Should be in sync with the repo config generated via curtin/MaaS
           source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-armband main"
           key: ${_param:armband_key}