From 466a4c3252e17370ed4d9d7c854738b26dbf1df1 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 7 Dec 2017 18:03:26 +0100 Subject: u/fuel: Bump & rebase for Pike upgrade - virtual deploys will use only UCA repos, without Armband/MCP; - base image pre-build is now upstream, drop our patches; - drop p/fuel libvirtd group workaround, now upstream in Fuel@OPNFV; - drop p/reclass glusterfs PPA arch extension, obsolete; - refactor armband repos in system.repo.mcp into: * armband (new, contains kernel, libvirt etc.); * armband_openstack (move into system.repo.mcp.openstack); * armband_mk_openstack (move intro system.repo.mcp.openstack); * armband_mcp_extra (move into system.repo.mcp.extra); - drop 'nova: Update console defaults for armv7, aarch64'; - minor rebase of nova libvirt driver patches in our roll-up; JIRA: ARMBAND-335 Change-Id: Ic5b7736cdd1d1ad5ff25728925198e8ea3e6b5b1 Signed-off-by: Alexandru Avadanii --- .../0010-seedng-module-Add-AArch64-repo.patch | 57 ---------------------- 1 file changed, 57 deletions(-) delete mode 100644 patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch (limited to 'patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch') diff --git a/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch deleted file mode 100644 index 86a57386..00000000 --- a/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch +++ /dev/null @@ -1,57 +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 -Date: Mon, 21 Aug 2017 20:42:00 +0200 -Subject: [PATCH] seedng: module: Add AArch64 repo - -salt custom py module seedng.py should use custom repo arg -"-R linux.enea.com/saltstack" on AArch64 nodes. - -Signed-off-by: Alexandru Avadanii ---- - mcp/patches/0009-seedng-module-Sync-salt-version.patch | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/mcp/patches/0009-seedng-module-Sync-salt-version.patch b/mcp/patches/0009-seedng-module-Sync-salt-version.patch -index d116c81..20233a9 100644 ---- a/mcp/patches/0009-seedng-module-Sync-salt-version.patch -+++ b/mcp/patches/0009-seedng-module-Sync-salt-version.patch -@@ -8,23 +8,29 @@ - :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - From: Alexandru Avadanii - Date: Mon, 21 Aug 2017 02:03:01 +0200 --Subject: [PATCH] seedng: module: Sync salt version -+Subject: [PATCH] seedng: module: Sync salt version, AArch64 repo - - salt custom py module seedng.py should use the same Salt version - when preinstalling minion for salt-controlled VMs via bootstrap - script. - -+While at it, add AArch64 repo. This used to be a separate patch, but -+we'll squash it in, so reverse-apply checks still work: -+- salt custom py module seedng.py should use custom repo arg -+ "-R linux.enea.com/saltstack" on AArch64 nodes. -+ - Signed-off-by: Alexandru Avadanii - --- - - diff --git a/_modules/seedng.py b/_modules/seedng.py - --- a/_modules/seedng.py - +++ b/_modules/seedng.py --@@ -256,8 +256,10 @@ -+@@ -256,8 +256,11 @@ - boot_, tmppath = (prep_bootstrap(mpt) - or salt.syspaths.BOOTSTRAP) - # Exec the chroot command --+ arg = 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2])) -++ arg = '-R linux.enea.com/saltstack ' if os.uname()[-1] == 'aarch64' else '' -++ arg += 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2])) - cmd = 'if type salt-minion; then exit 0; ' - - cmd += 'else sh {0} -c /tmp; fi'.format(os.path.join(tmppath, 'bootstrap-salt.sh')) - + cmd += 'else sh {0} -c /tmp {1}; fi'.format( -- cgit 1.2.3-korg