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']