From c118d1f4da660f38223160b74c7c29860ae5ed22 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 31 Aug 2009 12:07:52 +0200
Subject: [PATCH] Return cluster tags from LUQueryClusterInfo
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Olivier Tharan <olive@google.com>
---
lib/cmdlib.py | 1 +
scripts/gnt-cluster | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 4a36d5bfb..e65aef896 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2623,6 +2623,7 @@ class LUQueryClusterInfo(NoHooksLU):
"master_netdev": cluster.master_netdev,
"volume_group_name": cluster.volume_group_name,
"file_storage_dir": cluster.file_storage_dir,
+ "tags": list(cluster.GetTags()),
}
return result
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index fff42bb1f..2d53d1d6a 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -228,6 +228,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"]))
--
GitLab