Commit 68af861c authored by Helga Velroyen's avatar Helga Velroyen
Browse files

Fix lookup of xen toolstack in Haskell



There was a bug in the haskell implementation of node
query which made the lookup of the xen toolstack xm/xl
fail.
Signed-off-by: default avatarHelga Velroyen <helgav@google.com>
Reviewed-by: default avatarThomas Thrainer <thomasth@google.com>
parent d0d7d7cf
...@@ -260,5 +260,5 @@ getDefaultHypervisorSpec cfg = (hv, getHvParamsFromCluster cfg hv) ...@@ -260,5 +260,5 @@ getDefaultHypervisorSpec cfg = (hv, getHvParamsFromCluster cfg hv)
getHvParamsFromCluster :: ConfigData -> Hypervisor -> HvParams getHvParamsFromCluster :: ConfigData -> Hypervisor -> HvParams
getHvParamsFromCluster cfg hv = getHvParamsFromCluster cfg hv =
fromMaybe (GenericContainer (Map.fromList [])) fromMaybe (GenericContainer (Map.fromList []))
(Map.lookup (show hv) (Map.lookup (hypervisorToRaw hv)
(fromContainer (clusterHvparams (configCluster cfg)))) (fromContainer (clusterHvparams (configCluster cfg))))
...@@ -60,6 +60,7 @@ module Ganeti.Types ...@@ -60,6 +60,7 @@ module Ganeti.Types
, CVErrorCode(..) , CVErrorCode(..)
, cVErrorCodeToRaw , cVErrorCodeToRaw
, Hypervisor(..) , Hypervisor(..)
, hypervisorToRaw
, OobCommand(..) , OobCommand(..)
, StorageType(..) , StorageType(..)
, NodeEvacMode(..) , NodeEvacMode(..)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment