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

Return cluster tags from LUQueryClusterInfo


Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarOlivier Tharan <olive@google.com>
parent fc3fd894
...@@ -2623,6 +2623,7 @@ class LUQueryClusterInfo(NoHooksLU): ...@@ -2623,6 +2623,7 @@ class LUQueryClusterInfo(NoHooksLU):
"master_netdev": cluster.master_netdev, "master_netdev": cluster.master_netdev,
"volume_group_name": cluster.volume_group_name, "volume_group_name": cluster.volume_group_name,
"file_storage_dir": cluster.file_storage_dir, "file_storage_dir": cluster.file_storage_dir,
"tags": list(cluster.GetTags()),
} }
return result return result
......
...@@ -228,6 +228,13 @@ def ShowClusterConfig(opts, args): ...@@ -228,6 +228,13 @@ def ShowClusterConfig(opts, args):
ToStdout("Architecture (this node): %s (%s)", ToStdout("Architecture (this node): %s (%s)",
result["architecture"][0], result["architecture"][1]) 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("Default hypervisor: %s", result["default_hypervisor"])
ToStdout("Enabled hypervisors: %s", ", ".join(result["enabled_hypervisors"])) 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