aarch64: Pin qemu-efi from Armband repos

[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 c4542d3..61f222c 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
@@ -7,8 +7,6 @@
 ##############################################################################
 {%- import 'net_map.j2' as nm with context %}
 ---
-classes:
-  - cluster.all-mcp-arch-common.uca_repo
 parameters:
   _param:
     openstack_region: RegionOne
@@ -69,7 +67,7 @@ parameters:
 
     aodh_version: ${_param:openstack_version}
     aodh_service_host: ${_param:cluster_local_address}
-    gnocchi_version: 4.2
+    gnocchi_version: 4.3
     gnocchi_service_host: ${_param:cluster_local_address}
     panko_version: ${_param:openstack_version}
     panko_service_host: ${_param:cluster_local_address}
@@ -83,12 +81,23 @@ parameters:
           net.ipv4.tcp_congestion_control: yeah
           net.ipv4.tcp_slow_start_after_idle: 0
           net.ipv4.tcp_fin_timeout: 30
+{%- if 'aarch64' in nm.cluster.arch %}
       repo:
-        uca:
-          pin:
-            - pin: 'release o=Canonical'
+        armband_3:  # Should be in sync with the repo config generated via curtin/MaaS
+          source: "deb http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/xenial ${_param:armband_repo_version}-armband main"
+          key: ${_param:armband_key}
+          pinning:
+            15:
+              enabled: true
+              pin: 'release a=${_param:armband_repo_version}-armband'
+              priority: 15
+              package: '*'
+            1200:
+              enabled: true
+              pin: 'release a=${_param:armband_repo_version}-armband'
               priority: 1200
-              package: 'openvswitch* python-openvswitch ovn* dpdk* libdpdk*'
+              package: 'qemu-efi'
+{%- endif %}
     network:
       host:
         ctl: