Commit afc3c260 authored by Iustin Pop's avatar Iustin Pop

Show hidden/blacklisted OSes in cluster info

Since we can blacklist/hide non-existing OSes (for preseeding), we
cannot query easily the OSes themselves for this status. Hence we
export the entire lists in cluster info (which should be cheaper than
gnt-os diagnose).
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parent a53cd1f4
#
#
# Copyright (C) 2006, 2007, 2010 Google Inc.
# Copyright (C) 2006, 2007, 2010, 2011 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -321,6 +321,9 @@ def ShowClusterConfig(opts, args):
ToStdout("OS parameters:")
_PrintGroupedParams(result["osparams"])
ToStdout("Hidden OSes: %s", utils.CommaJoin(result["hidden_os"]))
ToStdout("Blacklisted OSes: %s", utils.CommaJoin(result["blacklisted_os"]))
ToStdout("Cluster parameters:")
ToStdout(" - candidate pool size: %s",
compat.TryToRoman(result["candidate_pool_size"],
......
......@@ -4604,6 +4604,8 @@ class LUClusterQuery(NoHooksLU):
"reserved_lvs": cluster.reserved_lvs,
"primary_ip_version": primary_ip_version,
"prealloc_wipe_disks": cluster.prealloc_wipe_disks,
"hidden_os": cluster.hidden_os,
"blacklisted_os": cluster.blacklisted_os,
}
return result
......
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