Revision 5b11f8db htools/Ganeti/Query/Server.hs

b/htools/Ganeti/Query/Server.hs
69 69 
      hypervisors = clusterEnabledHypervisors cluster
70 70 
      bits = show (bitSize (0::Int)) ++ "bits"
71 71 
      arch_tuple = [bits, arch]
72 
      obj = [ ("software_version", showJSON $ C.releaseVersion)
73 
            , ("protocol_version", showJSON $ C.protocolVersion)
74 
            , ("config_version", showJSON $ C.configVersion)
72 
      obj = [ ("software_version", showJSON C.releaseVersion)
73 
            , ("protocol_version", showJSON C.protocolVersion)
74 
            , ("config_version", showJSON C.configVersion)
75 75 
            , ("os_api_version", showJSON $ maximum C.osApiVersions)
76 
            , ("export_version", showJSON $ C.exportVersion)
77 
            , ("architecture", showJSON $ arch_tuple)
76 
            , ("export_version", showJSON C.exportVersion)
77 
            , ("architecture", showJSON arch_tuple)
78 78 
            , ("name", showJSON $ clusterClusterName cluster)
79 79 
            , ("master", showJSON $ clusterMasterNode cluster)
80 80 
            , ("default_hypervisor", showJSON $ head hypervisors)
81 
            , ("enabled_hypervisors", showJSON $ hypervisors)
81 
            , ("enabled_hypervisors", showJSON hypervisors)
82 82 
            , ("hvparams", showJSON $ clusterHvparams cluster)
83 83 
            , ("os_hvp", showJSON $ clusterOsHvp cluster)
84 84 
            , ("beparams", showJSON $ clusterBeparams cluster)
......
93 93 
            , ("master_netmask", showJSON $ clusterMasterNetmask cluster)
94 94 
            , ("use_external_mip_script",
95 95 
               showJSON $ clusterUseExternalMipScript cluster)
96 
            , ("volume_group_name", showJSON $clusterVolumeGroupName cluster)
96 
            , ("volume_group_name", showJSON $ clusterVolumeGroupName cluster)
97 97 
            , ("drbd_usermode_helper",
98 98 
               maybe JSNull showJSON (clusterDrbdUsermodeHelper cluster))
99 99 
            , ("file_storage_dir", showJSON $ clusterFileStorageDir cluster)

Also available in: Unified diff