From ed4d88894e8f8eafb081e3912d36bf526e12d4dc Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 13 Apr 2012 21:11:49 +0200
Subject: [PATCH] gnt-os modify: Add "--submit" option

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 lib/client/gnt_os.py | 4 ++--
 man/gnt-os.rst       | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/client/gnt_os.py b/lib/client/gnt_os.py
index 890becc7f..0ffa9aca4 100644
--- a/lib/client/gnt_os.py
+++ b/lib/client/gnt_os.py
@@ -274,7 +274,7 @@ def ModifyOS(opts, args):
                                   osparams=osp,
                                   hidden_os=ohid,
                                   blacklisted_os=oblk)
-  SubmitOpCode(op, opts=opts)
+  SubmitOrSend(op, opts)
 
   return 0
 
@@ -293,7 +293,7 @@ commands = {
   "modify": (
     ModifyOS, ARGS_ONE_OS,
     [HVLIST_OPT, OSPARAMS_OPT, DRY_RUN_OPT, PRIORITY_OPT,
-     HID_OS_OPT, BLK_OS_OPT],
+     HID_OS_OPT, BLK_OS_OPT, SUBMIT_OPT],
     "", "Modify the OS parameters"),
   }
 
diff --git a/man/gnt-os.rst b/man/gnt-os.rst
index c21556986..55fcd6a51 100644
--- a/man/gnt-os.rst
+++ b/man/gnt-os.rst
@@ -44,7 +44,7 @@ in the cluster, including its validity status, the supported API
 versions, the supported parameters (if any) and their
 documentations, etc.
 
-| **modify** [-H *HYPERVISOR*:option=*value*[,...]]
+| **modify** [\--submit] [-H *HYPERVISOR*:option=*value*[,...]]
 | [\--hidden=*yes|no*] [\--blacklisted=*yes|no*]
 | {*OS*}
 
@@ -66,6 +66,9 @@ Note: The given operating system doesn't have to exists. This allows
 preseeding the settings for operating systems not yet known to
 **gnt-os**.
 
+See **ganeti(7)** for a description of ``--submit`` and other common
+options.
+
 .. vim: set textwidth=72 :
 .. Local Variables:
 .. mode: rst
-- 
GitLab