From 7e7c4ae4ddd5d2016defcdcdedaabb28e2f931f7 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 23 Dec 2018 16:45:43 +0100 Subject: [armband] Parameterize aarch64 specific repo comp Factor out armband repository component name based on openstack_version parameter. However, since 'rocky-armband' repo is not available yet, reuse the 'queens-armband' on. Change-Id: Ibd17808059542ace14724776f8686fc2afd9de6a Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '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 b3c51f2e3..2434a9117 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 @@ -121,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} @@ -198,10 +199,10 @@ parameters: {%- 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 %} -- cgit 1.2.3-korg