diff options
author | 2018-05-10 18:09:26 +0200 | |
---|---|---|
committer | 2018-05-22 16:46:28 +0000 | |
commit | cf421ba6f593ad1d7c926db618657f8bf66d01a7 (patch) | |
tree | 301d7de4e5caec317f7fc2257defd45fda6f848d /patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch | |
parent | c70aa3538ef9b1da9b360ae3ba7112d8289ab876 (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>
(cherry picked from commit d680c5fb86c3fd4b25e7b7f766064a6ef4bf9a3b)
Diffstat (limited to 'patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch')
-rw-r--r-- | patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch new file mode 100644 index 00000000..f570a9bf --- /dev/null +++ b/patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch @@ -0,0 +1,42 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: Mon, 22 Jan 2018 19:41:37 +0100 +Subject: [PATCH] Revert "Get back to the GA kernel" + +This partially reverts commit b3b4b2e1bcd42f4628e53796c3dab81151f56bc2 +This reverts commit d06bcfb72c44b507c3efee4de00f415869f48450. +--- + mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml | 2 +- + mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml +index 238ae95a..3cdb8bf0 100644 +--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml ++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml +@@ -25,7 +25,7 @@ parameters: + maas_db_password: opnfv_secret + dns_server01: ${_param:opnfv_dns_server01} + single_address: ${_param:infra_maas_node01_deploy_address} +- hwe_kernel: 'hwe-16.04' ++ hwe_kernel: 'hwe-16.04-edge' + maas: + region: + salt_master_ip: ${_param:reclass_config_master} +diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml +index 6662f1fa..be18e212 100644 +--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml ++++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml +@@ -11,4 +11,4 @@ classes: + - cluster.mcp-pike-odl-ha.infra + parameters: + _param: +- hwe_kernel: 'ga-16.04' ++ hwe_kernel: 'hwe-16.04-edge' |