瀏覽代碼

Merge pull request #64 from alexandruavadanii/master

seedng: module: Sync salt version
pull/70/merge
Petr Michalec 7 年之前
父節點
當前提交
6bb146207d
No account linked to committer's email address
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. +3
    -1
      _modules/seedng.py

+ 3
- 1
_modules/seedng.py 查看文件

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



Loading…
取消
儲存