diff options
author | 2018-05-10 18:09:26 +0200 | |
---|---|---|
committer | 2018-05-22 18:17:44 +0200 | |
commit | d680c5fb86c3fd4b25e7b7f766064a6ef4bf9a3b (patch) | |
tree | 301d7de4e5caec317f7fc2257defd45fda6f848d /patches/opnfv-fuel/0009-Set-volume-name-in-source-file-to-sdX.patch | |
parent | 76919718c06a6dd58d63a1bc9b699d56d9086cdb (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/opnfv-fuel/0009-Set-volume-name-in-source-file-to-sdX.patch')
-rw-r--r-- | patches/opnfv-fuel/0009-Set-volume-name-in-source-file-to-sdX.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0009-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0009-Set-volume-name-in-source-file-to-sdX.patch new file mode 100644 index 00000000..65d58a78 --- /dev/null +++ b/patches/opnfv-fuel/0009-Set-volume-name-in-source-file-to-sdX.patch @@ -0,0 +1,44 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: Charalampos Kominos <Charalampos.Kominos@enea.com> +Date: Fri, 27 Apr 2018 14:54:22 +0200 +Subject: [PATCH] Set volume name in source file to sdX + +Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> +--- + .../classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +- + .../classes/cluster/mcp-pike-common-noha/openstack_control.yml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 +index 599c48e8..018253bb 100644 +--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 ++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 +@@ -130,7 +130,7 @@ parameters: + server: + cacert: /etc/ssl/certs/mcp_os_cacert + openrc_extra: +- volume_device_name: vdc ++ volume_device_name: sdc + bind: + server: + control: +diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml +index 29b2d627..3a994b8d 100644 +--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml ++++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml +@@ -71,7 +71,7 @@ parameters: + server: + admin_email: ${_param:admin_email} + openrc_extra: +- volume_device_name: vdc ++ volume_device_name: sdc + pkgs: + - keystone + - python-psycopg2 |