From 4d98c5658a6d01a7be3bb08c6c7328bb6d9678ae Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Tue, 13 Oct 2009 13:26:49 +0100
Subject: [PATCH] gnt-* use the correct opcode slot to build opcodes
gnt-* scripts were building wrong opcodes for commands which had the
shutdown_timeout slot (due to missing testing after renaming). Fixing.
Also change SHUTDOWN_TIMEOUT_OPT dest field name to "shutdown_timeout":
it was set to "timeout". It would still work that way, but possibly be
confusing.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/cli.py | 4 ++--
scripts/gnt-backup | 2 +-
scripts/gnt-instance | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/cli.py b/lib/cli.py
index f79738118..eff591ef4 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -821,8 +821,8 @@ TIMEOUT_OPT = cli_option("--timeout", dest="timeout", type="int",
default=constants.DEFAULT_SHUTDOWN_TIMEOUT,
help="Maximum time to wait")
-SHUTDOWN_TIMEOUT_OPT = cli_option("--shutdown-timeout", dest="timeout",
- type="int",
+SHUTDOWN_TIMEOUT_OPT = cli_option("--shutdown-timeout",
+ dest="shutdown_timeout", type="int",
default=constants.DEFAULT_SHUTDOWN_TIMEOUT,
help="Maximum time to wait for instance shutdown")
diff --git a/scripts/gnt-backup b/scripts/gnt-backup
index dc381dc0f..a07335651 100755
--- a/scripts/gnt-backup
+++ b/scripts/gnt-backup
@@ -73,7 +73,7 @@ def ExportInstance(opts, args):
op = opcodes.OpExportInstance(instance_name=args[0],
target_node=opts.node,
shutdown=opts.shutdown,
- timeout=opts.timeout)
+ shutdown_timeout=opts.shutdown_timeout)
fin_resu, dlist = SubmitOpCode(op)
if not isinstance(dlist, list):
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index a0941c200..ed0fa8daa 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -564,7 +564,7 @@ def RemoveInstance(opts, args):
op = opcodes.OpRemoveInstance(instance_name=instance_name,
ignore_failures=opts.ignore_failures,
- timeout=opts.timeout)
+ shutdown_timeout=opts.shutdown_timeout)
SubmitOrSend(op, opts, cl=cl)
return 0
@@ -715,7 +715,7 @@ def _RebootInstance(name, opts):
return opcodes.OpRebootInstance(instance_name=name,
reboot_type=opts.reboot_type,
ignore_secondaries=opts.ignore_secondaries,
- timeout=opts.timeout)
+ shutdown_timeout=opts.shutdown_timeout)
def _ShutdownInstance(name, opts):
@@ -806,7 +806,7 @@ def FailoverInstance(opts, args):
op = opcodes.OpFailoverInstance(instance_name=instance_name,
ignore_consistency=opts.ignore_consistency,
- timeout=opts.timeout)
+ shutdown_timeout=opts.shutdown_timeout)
SubmitOrSend(op, opts, cl=cl)
return 0
@@ -872,7 +872,7 @@ def MoveInstance(opts, args):
op = opcodes.OpMoveInstance(instance_name=instance_name,
target_node=opts.node,
- timeout=opts.timeout)
+ shutdown_timeout=opts.shutdown_timeout)
SubmitOrSend(op, opts, cl=cl)
return 0
--
GitLab