summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Santa Barbara <justinsb@justinsb-desktop>2010-08-08 13:05:24 -0700
committerJustin Santa Barbara <justinsb@justinsb-desktop>2010-08-08 13:05:24 -0700
commit993563b6cc9db9f24480678cf8b2d0750aee7a92 (patch)
tree7d16c431898c231c148cfec345c435770dbbbae8
parent00b5a4a1cb3b35aa07972ef93f12e86808111812 (diff)
Used new (clearer) flag names when calling processes
-rw-r--r--nova/process.py10
-rw-r--r--nova/volume/service.py3
2 files changed, 9 insertions, 4 deletions
diff --git a/nova/process.py b/nova/process.py
index 37ab538ee..d36de0410 100644
--- a/nova/process.py
+++ b/nova/process.py
@@ -123,15 +123,19 @@ class BackRelayWithInput(protocol.ProcessProtocol):
def get_process_output(executable, args=None, env=None, path=None,
process_reactor=None, check_exit_code=True,
- process_input=None, started_deferred=None):
+ process_input=None, started_deferred=None,
+ terminate_on_stderr=False):
if process_reactor is None:
process_reactor = reactor
args = args and args or ()
env = env and env and {}
deferred = defer.Deferred()
process_handler = BackRelayWithInput(
- deferred, started_deferred=started_deferred,
- check_exit_code=check_exit_code, process_input=process_input)
+ deferred,
+ started_deferred=started_deferred,
+ check_exit_code=check_exit_code,
+ process_input=process_input,
+ terminate_on_stderr=terminate_on_stderr)
# NOTE(vish): commands come in as unicode, but self.executes needs
# strings or process.spawn raises a deprecation warning
executable = str(executable)
diff --git a/nova/volume/service.py b/nova/volume/service.py
index e12f675a7..98cd0d3bf 100644
--- a/nova/volume/service.py
+++ b/nova/volume/service.py
@@ -149,7 +149,8 @@ class VolumeService(service.Service):
return
yield process.simple_execute("sudo vblade-persist auto all")
# NOTE(vish): this command sometimes sends output to stderr for warnings
- yield process.simple_execute("sudo vblade-persist start all", error_ok=1)
+ yield process.simple_execute("sudo vblade-persist start all",
+ terminate_on_stderr=False)
@defer.inlineCallbacks
def _init_volume_group(self):