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

lxc: states improvments

Browse Source 
- support for lxc_profiles
- support for stopping destroy

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
This commit is contained in:
Mathieu Le Marec - Pasquet 2015-05-20 19:26:39 +02:00
parent 644bd729f7
commit fcad7cb804
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
salt/states/lxc.py
View File

@ -18,6 +18,7 @@ def present(name,
clone_from=None,
snapshot=False,
profile=None,
network_profile=None,
template=None,
options=None,
image=None,
@ -57,6 +58,11 @@ def present(name,
<tutorial-lxc-profiles-container>` for more information). Values in a
profile will be overridden by the parameters listed below.
network_profile
Network Profile to use in container creation (see the :ref:`LXC Tutorial
<tutorial-lxc-profiles-container>` for more information). Values in a
profile will be overridden by the parameters listed below.
**Container Creation Arguments**
template
@ -201,21 +207,24 @@ def present(name,
result = __salt__['lxc.clone'](name,
clone_from,
profile=profile,
network_profile=network_profile,
snapshot=snapshot,
size=size,
backing=backing)
else:
result = __salt__['lxc.create'](name,
profile=profile,
template=template,
options=options,
image=image,
config=config,
fstype=fstype,
size=size,
backing=backing,
vgname=vgname,
lvname=lvname)
result = __salt__['lxc.create'](
name,
profile=profile,
network_profile=network_profile,
template=template,
options=options,
image=image,
config=config,
fstype=fstype,
size=size,
backing=backing,
vgname=vgname,
lvname=lvname)
except (CommandExecutionError, SaltInvocationError) as exc:
ret['result'] = False
ret['comment'] = exc.strerror
@ -290,13 +299,19 @@ def present(name,
return ret
def absent(name):
def absent(name, stop=False)
'''
Ensure a container is not present, destroying it if present
name
Name of the container to destroy
stop
stop before destroying
default: false
.. versionadded:: 2015.5.0
.. code-block:: yaml
web01:
@ -316,7 +331,7 @@ def absent(name):
return ret
try:
result = __salt__['lxc.destroy'](name)
result = __salt__['lxc.destroy'](name, stop=stop)
except (SaltInvocationError, CommandExecutionError) as exc:
ret['result'] = False
ret['comment'] = 'Failed to destroy container: {0}'.format(exc)