gnt-cluster info: Print and format disk parameters

Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index edb2eb0..d821af5 100644 (file)
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -462,6 +462,9 @@ def ShowClusterConfig(opts, args):
   ToStdout("Default nic parameters:")
   _PrintGroupedParams(result["nicparams"], roman=opts.roman_integers)
 
+  ToStdout("Default disk parameters:")
+  _PrintGroupedParams(result["diskparams"], roman=opts.roman_integers)
+
   ToStdout("Instance policy - limits for instances:")
   for key in constants.IPOLICY_ISPECS:
     ToStdout("  - %s", key)

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 8d9931c..d47f4d4 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -6177,6 +6177,7 @@ class LUClusterQuery(NoHooksLU):
       "ipolicy": cluster.ipolicy,
       "nicparams": cluster.nicparams,
       "ndparams": cluster.ndparams,
+      "diskparams": cluster.diskparams,
       "candidate_pool_size": cluster.candidate_pool_size,
       "master_netdev": cluster.master_netdev,
       "master_netmask": cluster.master_netmask,