gnt-cluster info: show more cluster parameters

[ganeti-local] / scripts / gnt-cluster

diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 928e0ac..9a17b96 100755 (executable)
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -207,7 +207,8 @@ def ShowClusterMaster(opts, args):
   @return: the desired exit code
 
   """
   @return: the desired exit code
 
   """

-  ToStdout("%s", GetClient().QueryConfigValues(["master_node"])[0])
+  master = bootstrap.GetMaster()
+  ToStdout(master)

   return 0
 
 
   return 0
 
 

@@ -242,6 +243,10 @@ def ShowClusterConfig(opts, args):
 
   ToStdout("Cluster parameters:")
   ToStdout("  - candidate pool size: %s", result["candidate_pool_size"])
 
   ToStdout("Cluster parameters:")
   ToStdout("  - candidate pool size: %s", result["candidate_pool_size"])

+  ToStdout("  - master netdev: %s", result["master_netdev"])
+  ToStdout("  - default bridge: %s", result["default_bridge"])
+  ToStdout("  - lvm volume group: %s", result["volume_group_name"])
+  ToStdout("  - file storage path: %s", result["file_storage_dir"])

 
   ToStdout("Default instance parameters:")
   for gr_name, gr_dict in result["beparams"].items():
 
   ToStdout("Default instance parameters:")
   for gr_name, gr_dict in result["beparams"].items():

@@ -506,6 +511,9 @@ def QueueOps(opts, args):
     else:
       val = "unset"
     ToStdout("The drain flag is %s" % val)
     else:
       val = "unset"
     ToStdout("The drain flag is %s" % val)

+  else:
+    raise errors.OpPrereqError("Command '%s' is not valid." % command)
+

   return 0
 
 # this is an option common to more than one command, so we declare
   return 0
 
 # this is an option common to more than one command, so we declare