Merge "[armband] Parameterize aarch64 specific repo comp"

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

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
index bb76fdb..2434a91 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/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 service addresses
@@ -123,6 +121,7 @@ parameters:
     neutron_compute_agent_mode: legacy
     neutron_compute_external_access: 'True'
     galera_server_cluster_name: openstack_cluster
+    armband_repo_version: 'queens'  # ${_param:openstack_version}
     glance_version: ${_param:openstack_version}
     glance_service_host: ${_param:openstack_control_address}
     keystone_version: ${_param:openstack_version}
@@ -197,18 +196,13 @@ parameters:
     # billometer_identity_token: ${_param:keystone_service_token}
   linux:
     system:
-      repo:
-        uca:
-          pin:
-            - pin: 'release o=Canonical'
-              priority: 1200
-              package: 'libvirt* qemu* 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"
+          source: "deb http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/${_param:linux_system_codename} ${_param:armband_repo_version}-armband main"
           key: ${_param:armband_key}
           pin:
-            - pin: 'release a=${_param:openstack_version}-armband'
+            - pin: 'release a=${_param:armband_repo_version}-armband'
               priority: 1201
               package: '*'
 {%- endif %}