Pārlūkot izejas kodu

Merge pull request #64 from alexandruavadanii/master

seedng: module: Sync salt version
pull/70/merge
Petr Michalec pirms 7 gadiem
vecāks
revīzija
6bb146207d
Revīzijas autora e-pasta adrese nav piesaistīta nevienam kontam
1 mainītis faili ar 3 papildinājumiem un 1 dzēšanām
  1. +3
    -1
      _modules/seedng.py

+ 3
- 1
_modules/seedng.py Parādīt failu

boot_, tmppath = (prep_bootstrap(mpt) boot_, tmppath = (prep_bootstrap(mpt)
or salt.syspaths.BOOTSTRAP) or salt.syspaths.BOOTSTRAP)
# Exec the chroot command # Exec the chroot command
arg = 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2]))
cmd = 'if type salt-minion; then exit 0; ' 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'] return not __salt__['cmd.run_chroot'](mpt, cmd, python_shell=True)['retcode']





Notiek ielāde…
Atcelt
Saglabāt