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

Always show prior state even state didn't change

Browse Source 
Also some further refactoring of the maintenance functions, including
adding a "restart" function and deprecating the "restart" argument in
lxc.start.
This commit is contained in:
Erik Johnson 2014-11-09 20:37:07 -06:00
parent 048d3f31ff
commit 072b39cc76
1 changed files with 99 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
salt/modules/lxc.py
View File

@ -1417,8 +1417,7 @@ def create(name,
if ret['retcode'] == 0 and exists(name):
c_state = state(name)
return {'result': True,
'changes': {'old': None, 'new': c_state},
'state': c_state}
'state': {'old': None, 'new': c_state}}
else:
if exists(name):
# destroy the container if it was partially created
@ -1519,7 +1518,9 @@ def clone(name,
ret = __salt__['cmd.run_all'](cmd, python_shell=False)
_clear_context()
if ret['retcode'] == 0 and exists(name):
return True
c_state = state(name)
return {'result': True,
'state': {'old': None, 'new': c_state}}
else:
if exists(name):
# destroy the container if it was partially created
@ -1629,14 +1630,11 @@ def list_(extra=False, limit=None):
def _change_state(cmd, name, expected):
pre = state(name)
if pre is None:
raise CommandExecutionError(
'Container \'{0}\' does not exist'.format(name)
)
elif pre == expected:
return {'state': expected,
'result': True,
'changes': {}}
if pre == expected:
return {'result': True,
'state': {'old': expected, 'new': expected},
'comment': 'Container \'{0}\' already {1}'
.format(name, expected)}
if cmd == 'lxc-destroy':
# Kill the container first
@ -1644,11 +1642,11 @@ def _change_state(cmd, name, expected):
python_shell=False)
cmd = '{0} -n {1}'.format(cmd, name)
err = __salt__['cmd.run_stderr'](cmd, python_shell=False)
if err:
error = __salt__['cmd.run_stderr'](cmd, python_shell=False)
if error:
raise CommandExecutionError(
'Error changing state for container \'{0}\' using command '
'\'{1}\': {2}'.format(name, cmd, err)
'\'{1}\': {2}'.format(name, cmd, error)
)
if expected is not None:
# some commands do not wait, so we will
@ -1656,10 +1654,8 @@ def _change_state(cmd, name, expected):
__salt__['cmd.run'](cmd, python_shell=False, timeout=30)
_clear_context()
post = state(name)
ret = {'state': post,
'result': post == expected}
if pre != post:
ret['changes'] = {'old': pre, 'new': post}
ret = {'result': post == expected,
'state': {'old': pre, 'new': post}}
return ret
@ -1694,31 +1690,85 @@ def _ensure_running(name, no_start=False):
return unfreeze(name)
def start(name, restart=False):
def restart(name, force=False):
'''
Start the named container.
.. versionadded:: 2014.7.1
Restart the named container. If the container was not running, the
container will merely be started.
name
The name of the container
force : False
If ``True``, the container will be force-stopped instead of gracefully
shut down
CLI Example:
.. code-block:: bash
salt '*' lxc.start name
salt myminion lxc.restart name
'''
_ensure_exists(name)
if restart:
stop(name)
orig_state = state(name)
if orig_state != 'stopped':
stop(name, kill=force)
ret = start(name)
ret['state']['old'] = orig_state
if orig_state != 'stopped':
ret['restarted'] = True
return ret
def start(name, **kwargs):
'''
Start the named container
restart : False
.. deprecated:: 2014.7.1
Use :mod:`lxc.restart <salt.modules.lxc.restart>`
Restart the container if it is already running
CLI Example:
.. code-block:: bash
salt myminion lxc.start name
'''
_ensure_exists(name)
if kwargs.get('restart', False):
salt.utils.warn_until(
'Boron',
'The \'restart\' argument to \'lxc.start\' has been deprecated, '
'please use \'lxc.restart\' instead.'
)
return restart(name)
if state(name) == 'frozen':
raise CommandExecutionError(
'Container \'{0}\' is frozen, use lxc.unfreeze'.format(name)
)
return _change_state('lxc-start -d', name, 'running')
def stop(name, kill=True):
def stop(name, kill=False):
'''
Stop the named container.
Stop the named container
kill : False
Do not wait for the container to stop, kill all tasks in the container.
Older LXC versions will stop containers like this irrespective of this
argument.
.. versionchanged:: 2014.7.1
Default value changed to ``False``
CLI Example:
.. code-block:: bash
salt '*' lxc.stop name
salt myminion lxc.stop name
'''
_ensure_exists(name)
cmd = 'lxc-stop'
@ -1727,9 +1777,15 @@ def stop(name, kill=True):
return _change_state(cmd, name, 'stopped')
def freeze(name):
def freeze(name, **kwargs):
'''
Freeze the named container.
Freeze the named container
start : False
If ``True`` and the container is stopped, the container will be started
before attempting to freeze.
.. versionadded:: 2014.7.1
CLI Example:
@ -1738,11 +1794,20 @@ def freeze(name):
salt '*' lxc.freeze name
'''
_ensure_exists(name)
if state(name) == 'stopped':
raise CommandExecutionError(
'Container \'{0}\' is stopped'.format(name)
)
return _change_state('lxc-freeze', name, 'frozen')
orig_state = state(name)
start_ = kwargs.get('start', False)
if orig_state == 'stopped':
if not start_:
raise CommandExecutionError(
'Container \'{0}\' is stopped'.format(name)
)
start(name)
ret = _change_state('lxc-freeze', name, 'frozen')
if orig_state == 'stopped' and start_:
ret['state']['old'] = orig_state
ret['started'] = True
ret['state']['new'] = state(name)
return ret
def unfreeze(name):
@ -1778,6 +1843,7 @@ def destroy(name, stop=True):
salt '*' lxc.destroy foo
salt '*' lxc.destroy foo stop=False
'''
_ensure_exists(name)
if not stop and state(name) != 'stopped':
raise CommandExecutionError(
'Container \'{0}\' is not stopped'.format(name)