From 7b9ceea77189c4351488c81c02f610bbc74c73af Mon Sep 17 00:00:00 2001
From: Helga Velroyen <helgav@google.com>
Date: Wed, 13 Mar 2013 15:38:17 +0100
Subject: [PATCH] gnt-cluster info: show enabled storage types
This extends the 'gnt-cluster info' command to list the storage types
that are enabled on the cluster. It also fixes the broken indentation
in the 'handleCall' function.
Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/client/gnt_cluster.py | 2 ++
src/Ganeti/Query/Server.hs | 10 ++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index 77d8a6ffe..f87a2748f 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -454,6 +454,8 @@ def ShowClusterConfig(opts, args):
ToStdout(" - OS search path: %s", utils.CommaJoin(pathutils.OS_SEARCH_PATH))
ToStdout(" - ExtStorage Providers search path: %s",
utils.CommaJoin(pathutils.ES_SEARCH_PATH))
+ ToStdout(" - enabled storage types: %s",
+ utils.CommaJoin(result["enabled_storage_types"]))
ToStdout("Default node parameters:")
_PrintGroupedParams(result["ndparams"], roman=opts.roman_integers)
diff --git a/src/Ganeti/Query/Server.hs b/src/Ganeti/Query/Server.hs
index df0e11c5b..67298e981 100644
--- a/src/Ganeti/Query/Server.hs
+++ b/src/Ganeti/Query/Server.hs
@@ -87,6 +87,7 @@ handleCall :: ConfigData -> LuxiOp -> IO (ErrorResult JSValue)
handleCall cdata QueryClusterInfo =
let cluster = configCluster cdata
hypervisors = clusterEnabledHypervisors cluster
+ storageTypes = clusterEnabledStorageTypes cluster
def_hv = case hypervisors of
x:_ -> showJSON x
[] -> JSNull
@@ -135,10 +136,11 @@ handleCall cdata QueryClusterInfo =
, ("reserved_lvs", showJSON $ clusterReservedLvs cluster)
, ("primary_ip_version",
showJSON . ipFamilyToVersion $ clusterPrimaryIpFamily cluster)
- , ("prealloc_wipe_disks",
- showJSON $ clusterPreallocWipeDisks cluster)
- , ("hidden_os", showJSON $ clusterHiddenOs cluster)
- , ("blacklisted_os", showJSON $ clusterBlacklistedOs cluster)
+ , ("prealloc_wipe_disks",
+ showJSON $ clusterPreallocWipeDisks cluster)
+ , ("hidden_os", showJSON $ clusterHiddenOs cluster)
+ , ("blacklisted_os", showJSON $ clusterBlacklistedOs cluster)
+ , ("enabled_storage_types", showJSON storageTypes)
]
in return . Ok . J.makeObj $ obj
--
GitLab