From 08513c14429299e8095bc8fa6c676c753cac2869 Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Sun, 29 Mar 2015 17:00:15 -0500 Subject: [PATCH] Rename exec_method to exec_driver --- salt/modules/lxc.py | 6 +++--- salt/modules/nspawn.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/salt/modules/lxc.py b/salt/modules/lxc.py index a8f47720e6..bd63cce17a 100644 --- a/salt/modules/lxc.py +++ b/salt/modules/lxc.py @@ -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) diff --git a/salt/modules/nspawn.py b/salt/modules/nspawn.py index c6862c5eaa..319e180bdb 100644 --- a/salt/modules/nspawn.py +++ b/salt/modules/nspawn.py @@ -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)