diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-22 15:18:22 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-22 15:18:22 +0200 |
commit | e12e66a156e16993d5613e974bb3d21eda171d5a (patch) | |
tree | 9aba8f69b4a74ae7096669dbed0e6e5d17d6d0b4 | |
parent | bba197c75ad98018e1dec388e6b27217982f154c (diff) |
[patch] AArch64: reclass system arch tweaks
Armband has been carrying a few arch-enablement patches that are
required for the default reclass system classes to work as expected
on AArch64 systems.
Change-Id: I1f96c062eb3f9dcabb8513aadd1ea41be4fbc098
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
3 files changed, 115 insertions, 0 deletions
diff --git a/mcp/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-glusterfs-repo.patch b/mcp/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-glusterfs-repo.patch new file mode 100644 index 000000000..458cf3bfe --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-glusterfs-repo.patch @@ -0,0 +1,36 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Sun, 26 Nov 2017 17:55:13 +0100 +Subject: [PATCH] linux.system.repo: Drop arch for glusterfs repo + +Extending the arch list to 'amd64,arm64' would lead to doubling repo +metadata downloads on all archs, while dropping it will allow APT to +only download the repo metadata for the current system arch. + +To keep old behavior for amd64 and prevent multiple downloads, let's +just drop the 'architectures' field. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + linux/system/repo/glusterfs.yml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/linux/system/repo/glusterfs.yml b/linux/system/repo/glusterfs.yml +index 71d063ac..9afe553c 100644 +--- a/linux/system/repo/glusterfs.yml ++++ b/linux/system/repo/glusterfs.yml +@@ -6,7 +6,6 @@ parameters: + repo: + glusterfs-ppa: + source: "deb http://ppa.launchpad.net/gluster/glusterfs-${_param:glusterfs_version}/ubuntu ${_param:linux_system_codename} main" +- architectures: amd64 + key_id: 3FE869A9 + key_server: keyserver.ubuntu.com + pin: diff --git a/mcp/patches/reclass-system-salt-model/0005-linux.system.repo-Drop-arch-for-openstack-repo.patch b/mcp/patches/reclass-system-salt-model/0005-linux.system.repo-Drop-arch-for-openstack-repo.patch new file mode 100644 index 000000000..1da4a2124 --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0005-linux.system.repo-Drop-arch-for-openstack-repo.patch @@ -0,0 +1,40 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Wed, 4 Apr 2018 20:08:55 +0200 +Subject: [PATCH] linux.system.repo: Drop arch for openstack repo + +Now that mcp-repos mirror has arm64 packages too, we can either extend +the current architecture list or just drop it and let APT figure it +out. + +Extending the arch list to 'amd64,arm64' would lead to doubling repo +metadata downloads on all archs, while dropping it will allow APT to +only download the repo metadata for the current system arch. + +To keep old behavior for amd64 and prevent multiple downloads, let's +just drop the 'architectures' field. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + linux/system/repo/mcp/openstack.yml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml +index 465b75d0..8de17774 100644 +--- a/linux/system/repo/mcp/openstack.yml ++++ b/linux/system/repo/mcp/openstack.yml +@@ -7,7 +7,6 @@ parameters: + repo: + mirantis_openstack: + source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version} main" +- architectures: amd64 + key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key" + pin: + - pin: 'release l=${_param:openstack_version}' diff --git a/mcp/patches/reclass-system-salt-model/0006-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch b/mcp/patches/reclass-system-salt-model/0006-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch new file mode 100644 index 000000000..b2337bcf3 --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0006-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch @@ -0,0 +1,39 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Thu, 7 Jun 2018 21:19:07 +0200 +Subject: [PATCH] linux.system.repo: Drop arch for mcp.mirror repo + +Extending the arch list to 'amd64,arm64' would lead to doubling repo +metadata downloads on all archs, while dropping it will allow APT to +only download the repo metadata for the current system arch. + +Setting the new linux_system_architectures is also problematic in the +context of mixed-architecture clusters. + +To keep old behavior for amd64 and prevent multiple downloads, let's +just drop the 'architectures' field. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + linux/system/repo/mcp/mirror/v1/openstack.yml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml +index a4a369b2..933bf53a 100644 +--- a/linux/system/repo/mcp/mirror/v1/openstack.yml ++++ b/linux/system/repo/mcp/mirror/v1/openstack.yml +@@ -7,7 +7,6 @@ parameters: + repo: + mirantis_openstack: + source: "deb http://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename} ${_param:linux_system_codename} main" +- architectures: ${_param:linux_system_architecture} + clean_file: true + key_url: https://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename}/archive-${_param:openstack_version}.key + pin: |