From f37103b4d60f057f653e0e5e8b7c6c3023a95b2d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 3 Jan 2018 23:41:32 +0100 Subject: [baremetal] Switch VCP base image to UCA Since Mirantis prebuilt image comes with salt-minion 2016.3 instead of 2016.11 and upgrading it leads to a hard to break catch-22, use the Ubuntu cloud archive image we already download for FN VMs and pre-install: - a newer kernel (hwe-edge); - salt-minion (2016.11); This also implicitly aligns the image handling on AArch64 and x86_64. Change-Id: I86d1c777449d37bdd0348936a598e3ffe9d265af Signed-off-by: Alexandru Avadanii --- .../0009-seedng-module-Sync-salt-version.patch | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 mcp/patches/0009-seedng-module-Sync-salt-version.patch (limited to 'mcp/patches/0009-seedng-module-Sync-salt-version.patch') diff --git a/mcp/patches/0009-seedng-module-Sync-salt-version.patch b/mcp/patches/0009-seedng-module-Sync-salt-version.patch deleted file mode 100644 index d116c811d..000000000 --- a/mcp/patches/0009-seedng-module-Sync-salt-version.patch +++ /dev/null @@ -1,34 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Mirantis Inc., 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 02:03:01 +0200 -Subject: [PATCH] seedng: module: Sync salt version - -salt custom py module seedng.py should use the same Salt version -when preinstalling minion for salt-controlled VMs via bootstrap -script. - -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 @@ - boot_, tmppath = (prep_bootstrap(mpt) - or salt.syspaths.BOOTSTRAP) - # Exec the chroot command -+ 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( -+ os.path.join(tmppath, 'bootstrap-salt.sh'), arg) - return not __salt__['cmd.run_chroot'](mpt, cmd, python_shell=True)['retcode'] - - -- cgit 1.2.3-korg