From cb573a3113f587188df6e21dfe8838fda7e81252 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 10 Feb 2010 11:30:33 +0100
Subject: [PATCH] Convert scripts to pass options to the JobExecutor
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
scripts/gnt-debug | 2 +-
scripts/gnt-instance | 6 +++---
scripts/gnt-node | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/gnt-debug b/scripts/gnt-debug
index 1df5a7a82..532a4c77e 100755
--- a/scripts/gnt-debug
+++ b/scripts/gnt-debug
@@ -70,7 +70,7 @@ def GenericOpCodes(opts, args):
"""
cl = cli.GetClient()
- jex = cli.JobExecutor(cl=cl, verbose=opts.verbose)
+ jex = cli.JobExecutor(cl=cl, verbose=opts.verbose, opts=opts)
job_cnt = 0
op_cnt = 0
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 735a1f841..81cf1c27d 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -222,7 +222,7 @@ def GenericManyOps(operation, fn):
if not (opts.force_multi or not multi_on
or _ConfirmOperation(inames, operation)):
return 1
- jex = JobExecutor(verbose=multi_on, cl=cl)
+ jex = JobExecutor(verbose=multi_on, cl=cl, opts=opts)
for name in inames:
op = fn(name, opts)
jex.QueueJob(name, op)
@@ -423,7 +423,7 @@ def BatchCreate(opts, args):
ToStderr("Can't parse the instance definition file: %s" % str(err))
return 1
- jex = JobExecutor()
+ jex = JobExecutor(opts=opts)
# Iterate over the instances and do:
# * Populate the specs with default value
@@ -560,7 +560,7 @@ def ReinstallInstance(opts, args):
if not AskUser(usertext):
return 1
- jex = JobExecutor(verbose=multi_on)
+ jex = JobExecutor(verbose=multi_on, opts=opts)
for instance_name in inames:
op = opcodes.OpReinstallInstance(instance_name=instance_name,
os_type=os_name,
diff --git a/scripts/gnt-node b/scripts/gnt-node
index 25513c747..3e9b0b4c5 100755
--- a/scripts/gnt-node
+++ b/scripts/gnt-node
@@ -324,7 +324,7 @@ def FailoverNode(opts, args):
(",".join("'%s'" % name for name in pinst))):
return 2
- jex = JobExecutor(cl=cl)
+ jex = JobExecutor(cl=cl, opts=opts)
for iname in pinst:
op = opcodes.OpFailoverInstance(instance_name=iname,
ignore_consistency=opts.ignore_consistency)
--
GitLab