valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

salt.modules.lxc: ensure lxc is running *before* call to seed.apply

Browse Source
This commit is contained in:
Matthew Williams 2014-03-19 02:06:44 -04:00
parent 95431905a7
commit fa3fa3a011
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/lxc.py
View File

@ -1070,12 +1070,12 @@ def bootstrap(name, config=None, approve_key=True, install=True):
if not infos:
return None
prior_state = _ensure_running(name)
__salt__['seed.apply'](infos['rootfs'], id_=name, config=config,
approve_key=approve_key, install=False,
prep_install=True)
prior_state = _ensure_running(name)
cmd = 'bash -c "if type salt-minion; then exit 0; '
if install:
cmd += 'else sh /tmp/bootstrap.sh -c /tmp; '