Commit a4913296 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Merge commit 'origin/next' into branch-2.1

* commit 'origin/next':
  Return cluster tags from LUQueryClusterInfo

Conflicts:
	lib/cmdlib.py: Trivial
parents 7a2ba406 c118d1f4
......@@ -3078,6 +3078,7 @@ class LUQueryClusterInfo(NoHooksLU):
"file_storage_dir": cluster.file_storage_dir,
"ctime": cluster.ctime,
"mtime": cluster.mtime,
"tags": list(cluster.GetTags()),
}
return result
......
......@@ -229,6 +229,13 @@ def ShowClusterConfig(opts, args):
ToStdout("Architecture (this node): %s (%s)",
result["architecture"][0], result["architecture"][1])
if result["tags"]:
tags = ", ".join(utils.NiceSort(result["tags"]))
else:
tags = "(none)"
ToStdout("Tags: %s", tags)
ToStdout("Default hypervisor: %s", result["default_hypervisor"])
ToStdout("Enabled hypervisors: %s", ", ".join(result["enabled_hypervisors"]))
......
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