From 8fbafdf8a665fb8fff4d6f9f14c343e109c122ec Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 14 Dec 2017 17:47:55 +0100 Subject: [PATCH] patches: Drop salt ver sync patch, now upstream Upstream pull request [1] was merged, drop out patch. [1] https://github.com/salt-formulas/salt-formula-salt/pull/64 Change-Id: I7aac66349a4bec718f7821b75dbad711cd6acd58 Signed-off-by: Alexandru Avadanii --- .../0009-seedng-module-Sync-salt-version.patch | 34 ---------------------- mcp/patches/patches.list | 1 - 2 files changed, 35 deletions(-) delete mode 100644 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'] - - diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index 4214b63a7..a87a935bc 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -12,7 +12,6 @@ /usr/share/salt-formulas/env: 0005-maas-module-Obtain-fabric-ID-from-CIDR.patch /usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch -/usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch /usr/share/salt-formulas/env: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch -- 2.16.6