From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 25 Sep 2018 14:48:41 +0000 (+0200)
Subject: [AArch64] noha: Add armband repo prio
X-Git-Tag: opnfv-7.0.0~25^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F62969%2F1;p=fuel.git

[AArch64] noha: Add armband repo prio

Previously, only HA scenarios required the Armband repository
configuration (including its higher repo prio pinning), since NOHA
scenarios were not supported on baremetal.

With multiarch hybrid POD support landing, the same repo prio should
be set for NOHA scenarios.

Change-Id: I676ee262e270ce4689c44c245967badebc2efe2c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit f160b9ef9351be59b8ead17f35275ca368091fe0)
---

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 26a4bac73..ba6636da7 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
@@ -126,6 +126,15 @@ parameters:
             - pin: 'release o=Canonical'
               priority: 1200
               package: 'openvswitch* python-openvswitch ovn* dpdk* libdpdk*'
+{%- if 'aarch64' in nm.cluster.arch %}
+        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}
+          pin:
+            - pin: 'release a=${_param:openstack_version}-armband'
+              priority: 1201
+              package: '*'
+{%- endif %}
     network:
       host:
         ctl: