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

Rename exec_method to exec_driver

Browse Source
This commit is contained in:
Erik Johnson 2015-03-29 17:00:15 -05:00
parent 35b376eeda
commit 08513c1442
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/lxc.py
View File

@ -51,7 +51,7 @@ __func_alias__ = {
__virtualname__ = 'lxc'
DEFAULT_NIC = 'eth0'
SEED_MARKER = '/lxc.initial_seed'
EXEC_METHOD = 'lxc-attach'
EXEC_DRIVER = 'lxc-attach'
_marker = object()
@ -2837,7 +2837,7 @@ def _run(name,
name,
cmd,
container_type=__virtualname__,
exec_method=EXEC_METHOD,
exec_driver=EXEC_DRIVER,
output=output,
no_start=no_start,
stdin=stdin,
@ -3348,7 +3348,7 @@ def copy_to(name, source, dest, overwrite=False, makedirs=False):
source,
dest,
container_type=__virtualname__,
exec_method=EXEC_METHOD,
exec_driver=EXEC_DRIVER,
overwrite=overwrite,
makedirs=makedirs)

6
salt/modules/nspawn.py
View File

@ -48,7 +48,7 @@ __func_alias__ = {
__virtualname__ = 'nspawn'
SEED_MARKER = '/nspawn.initial_seed'
WANT = '/etc/systemd/system/multi-user.target.wants/systemd-nspawn@{0}.service'
EXEC_METHOD = 'nsenter'
EXEC_DRIVER = 'nsenter'
def __virtual__():
@ -269,7 +269,7 @@ def _run(name,
name,
cmd,
container_type=__virtualname__,
exec_method=EXEC_METHOD,
exec_driver=EXEC_DRIVER,
output=output,
no_start=no_start,
stdin=stdin,
@ -1283,7 +1283,7 @@ def copy_to(name, source, dest, overwrite=False, makedirs=False):
path,
dest,
container_type=__virtualname__,
exec_method=EXEC_METHOD,
exec_driver=EXEC_DRIVER,
overwrite=overwrite,
makedirs=makedirs)