Bladeren bron

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 <Alexandru.Avadanii@enea.com>
pull/64/head
Alexandru Avadanii 7 jaren geleden
bovenliggende
commit
398e69fcf9
1 gewijzigde bestanden met toevoegingen van 3 en 1 verwijderingen
  1. +3
    -1
      _modules/seedng.py

+ 3
- 1
_modules/seedng.py Bestand weergeven

@@ -256,8 +256,10 @@ def _install(mpt):
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']



Laden…
Annuleren
Opslaan