summaryrefslogtreecommitdiffstats
path: root/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-10 18:09:26 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-22 18:17:44 +0200
commitd680c5fb86c3fd4b25e7b7f766064a6ef4bf9a3b (patch)
tree301d7de4e5caec317f7fc2257defd45fda6f848d /patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch
parent76919718c06a6dd58d63a1bc9b699d56d9086cdb (diff)
[salt] Retire Armband Saltstack repos
Provided we take care of the minor consequences of relying strictly on upstream Saltstack amd64 repos on arm64 (since we don't use RAET, this means merely installing `python-futures` as a dependency of `python-tornado` on all minions), we can finally drop our Salstack arm64 repository. This implies installing python-futures on: - FN and VCP VMs (handled via lib.sh pre-patching); - baremetal nodes (handled via MaaS Curtin template for arm64 now); While at it, also handle other minor patch cleanup operations: * drop `system.linux.system.repo.mcp.armband`, already covered by: - lib.sh pre-patching for FN and VCP VM images; - maas.region.repositories for baremetal nodes; * switch glusterfs PPA repo arch from 'amd64,arm64' to None; * drop obsolete patch handling `mcelog` on AArch64; [1] https://github.com/salt-formulas/salt-formula-maas/pull/26 JIRA: ARMBAND-382 Change-Id: I34f3bd70ebf10395e8d4e70498ff3a144b4d9c3b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch')
-rw-r--r--patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch b/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch
deleted file mode 100644
index f1b7824b..00000000
--- a/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 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: Mon, 10 Jul 2017 15:31:08 +0000
-Subject: [PATCH] linux.system.repo.mcp: Add Armband repos
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- linux/system/repo/mcp/armband.yml | 12 ++++++++++++
- linux/system/repo/mcp/extra.yml | 10 ++++++++++
- linux/system/repo/mcp/openstack.yml | 17 +++++++++++++++++
- 3 files changed, 39 insertions(+)
- create mode 100644 linux/system/repo/mcp/armband.yml
-
-diff --git a/linux/system/repo/mcp/armband.yml b/linux/system/repo/mcp/armband.yml
-new file mode 100644
-index 0000000..d1fa43a
---- /dev/null
-+++ b/linux/system/repo/mcp/armband.yml
-@@ -0,0 +1,12 @@
-+parameters:
-+ linux:
-+ system:
-+ repo:
-+ armband:
-+ source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-armband main"
-+ architectures: arm64
-+ key_url: "https://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key"
-+ pin:
-+ - pin: 'release l=${_param:openstack_version}-armband'
-+ priority: 1100
-+ package: '*'
-diff --git a/linux/system/repo/mcp/extra.yml b/linux/system/repo/mcp/extra.yml
-index 9839a23..ad9b5ce 100644
---- a/linux/system/repo/mcp/extra.yml
-+++ b/linux/system/repo/mcp/extra.yml
-@@ -14,3 +14,13 @@ parameters:
- - pin: 'release a=${_param:linux_system_repo_mcp_extra_version}'
- priority: 1100
- package: '*'
-+ # Armband only provides apt_mk_version=nightly for now
-+ armband_mcp_extra:
-+ source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly extra"
-+ architectures: arm64
-+ key_url: "https://linux.enea.com/apt-mk/public.gpg"
-+ clean_file: true
-+ pin:
-+ - pin: 'release a=nightly'
-+ priority: 1100
-+ package: '*'