Revision 7b9ceea7
| b/lib/client/gnt_cluster.py | ||
|---|---|---|
| 454 | 454 |
ToStdout(" - OS search path: %s", utils.CommaJoin(pathutils.OS_SEARCH_PATH))
|
| 455 | 455 |
ToStdout(" - ExtStorage Providers search path: %s",
|
| 456 | 456 |
utils.CommaJoin(pathutils.ES_SEARCH_PATH)) |
| 457 |
ToStdout(" - enabled storage types: %s",
|
|
| 458 |
utils.CommaJoin(result["enabled_storage_types"])) |
|
| 457 | 459 |
|
| 458 | 460 |
ToStdout("Default node parameters:")
|
| 459 | 461 |
_PrintGroupedParams(result["ndparams"], roman=opts.roman_integers) |
| b/src/Ganeti/Query/Server.hs | ||
|---|---|---|
| 87 | 87 |
handleCall cdata QueryClusterInfo = |
| 88 | 88 |
let cluster = configCluster cdata |
| 89 | 89 |
hypervisors = clusterEnabledHypervisors cluster |
| 90 |
storageTypes = clusterEnabledStorageTypes cluster |
|
| 90 | 91 |
def_hv = case hypervisors of |
| 91 | 92 |
x:_ -> showJSON x |
| 92 | 93 |
[] -> JSNull |
| ... | ... | |
| 135 | 136 |
, ("reserved_lvs", showJSON $ clusterReservedLvs cluster)
|
| 136 | 137 |
, ("primary_ip_version",
|
| 137 | 138 |
showJSON . ipFamilyToVersion $ clusterPrimaryIpFamily cluster) |
| 138 |
, ("prealloc_wipe_disks",
|
|
| 139 |
showJSON $ clusterPreallocWipeDisks cluster) |
|
| 140 |
, ("hidden_os", showJSON $ clusterHiddenOs cluster)
|
|
| 141 |
, ("blacklisted_os", showJSON $ clusterBlacklistedOs cluster)
|
|
| 139 |
, ("prealloc_wipe_disks",
|
|
| 140 |
showJSON $ clusterPreallocWipeDisks cluster) |
|
| 141 |
, ("hidden_os", showJSON $ clusterHiddenOs cluster)
|
|
| 142 |
, ("blacklisted_os", showJSON $ clusterBlacklistedOs cluster)
|
|
| 143 |
, ("enabled_storage_types", showJSON storageTypes)
|
|
| 142 | 144 |
] |
| 143 | 145 |
|
| 144 | 146 |
in return . Ok . J.makeObj $ obj |
Also available in: Unified diff