From 4b7633206d407e8581cfce97052903fed67d7888 Mon Sep 17 00:00:00 2001 From: Helga Velroyen Date: Tue, 18 Jun 2013 09:39:15 +0200 Subject: [PATCH] Revert "Make NodeInfo (hs) accept arbitrary storage types" This reverts commit e89525a859b2e841c08fce506c0b68b97c7efe61. Signed-off-by: Helga Velroyen Reviewed-by: Thomas Thrainer --- src/Ganeti/Query/Node.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Ganeti/Query/Node.hs b/src/Ganeti/Query/Node.hs index c845777..792803d 100644 --- a/src/Ganeti/Query/Node.hs +++ b/src/Ganeti/Query/Node.hs @@ -43,7 +43,7 @@ import Ganeti.Types import Ganeti.Query.Language import Ganeti.Query.Common import Ganeti.Query.Types -import Ganeti.Storage.Utils +import qualified Ganeti.Types as T import Ganeti.Utils (niceSort) -- | Runtime is the resulting type for NodeInfo call. @@ -233,7 +233,10 @@ collectLiveData:: Bool -> ConfigData -> [Node] -> IO [(Node, Runtime)] collectLiveData False _ nodes = return $ zip nodes (repeat $ Left (RpcResultError "Live data disabled")) collectLiveData True cfg nodes = do - let storage_units = getClusterStorageUnits cfg + let vgs = maybeToList . clusterVolumeGroupName $ configCluster cfg + -- FIXME: This currently sets every storage unit to LVM + storage_units = zip (repeat T.StorageLvmVg) vgs ++ + zip (repeat T.StorageLvmPv) vgs hvs = [getDefaultHypervisorSpec cfg] step n (bn, gn, em) = let ndp' = getNodeNdParams cfg n -- 1.7.10.4