diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-04 20:15:44 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-04 23:26:41 +0000 |
| commit | 75b24ec48e363d7813fe84b284a86a6c0ea5b75c (patch) | |
| tree | d24ec62eebe22141d84cd289e352a57cdb005dfe /patches/reclass-system-salt-model | |
| parent | 472aeddea5457cc84c403edd9d4ed8d193f64c40 (diff) | |
p/reclass-system-salt-model: drop openstack arch
mcp-repos now has arm64 packages too, drop its architecture list
(currently hardcoded to 'amd64') to be able to pick them up.
Change-Id: Icefefe21111dc65713fde45ed9994e78e6b33ca6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 4dacfa496fa0a714835abed1267ee76ec979993a)
Diffstat (limited to 'patches/reclass-system-salt-model')
| -rw-r--r-- | patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-openstack-repo.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-openstack-repo.patch b/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-openstack-repo.patch new file mode 100644 index 00000000..9fd02fa1 --- /dev/null +++ b/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-openstack-repo.patch @@ -0,0 +1,40 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 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 22defb75..302c7cb3 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}' |