Revision 64b0309a
b/src/Ganeti/Objects.hs | ||
---|---|---|
574 | 574 |
, simpleField "highest_used_port" [t| Int |] |
575 | 575 |
, simpleField "tcpudp_port_pool" [t| [Int] |] |
576 | 576 |
, simpleField "mac_prefix" [t| String |] |
577 |
, simpleField "volume_group_name" [t| String |] |
|
577 |
, optionalField $ |
|
578 |
simpleField "volume_group_name" [t| String |] |
|
578 | 579 |
, simpleField "reserved_lvs" [t| [String] |] |
579 | 580 |
, optionalField $ |
580 | 581 |
simpleField "drbd_usermode_helper" [t| String |] |
b/src/Ganeti/Query/Node.hs | ||
---|---|---|
31 | 31 |
|
32 | 32 |
import Control.Applicative |
33 | 33 |
import Data.List |
34 |
import Data.Maybe |
|
34 | 35 |
import qualified Data.Map as Map |
35 | 36 |
import qualified Text.JSON as J |
36 | 37 |
|
... | ... | |
221 | 222 |
maybeCollectLiveData False _ nodes = |
222 | 223 |
return $ zip nodes (repeat $ Left (RpcResultError "Live data disabled")) |
223 | 224 |
maybeCollectLiveData True cfg nodes = do |
224 |
let vgs = [clusterVolumeGroupName $ configCluster cfg]
|
|
225 |
let vgs = maybeToList . clusterVolumeGroupName $ configCluster cfg
|
|
225 | 226 |
hvs = [getDefaultHypervisor cfg] |
226 | 227 |
step n (bn, gn, em) = |
227 | 228 |
let ndp' = getNodeNdParams cfg n |
b/src/Ganeti/Query/Server.hs | ||
---|---|---|
116 | 116 |
, ("master_netmask", showJSON $ clusterMasterNetmask cluster) |
117 | 117 |
, ("use_external_mip_script", |
118 | 118 |
showJSON $ clusterUseExternalMipScript cluster) |
119 |
, ("volume_group_name", showJSON $ clusterVolumeGroupName cluster) |
|
119 |
, ("volume_group_name", |
|
120 |
maybe JSNull showJSON (clusterVolumeGroupName cluster)) |
|
120 | 121 |
, ("drbd_usermode_helper", |
121 | 122 |
maybe JSNull showJSON (clusterDrbdUsermodeHelper cluster)) |
122 | 123 |
, ("file_storage_dir", showJSON $ clusterFileStorageDir cluster) |
Also available in: Unified diff