From 664a9d73e09fb826752136b9cc555a634bdafd42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Tue, 9 Mar 2010 10:40:46 +0100
Subject: [PATCH] =?UTF-8?q?Show=20per-os-hypervisor=20parameters=20in=20?=
=?UTF-8?q?=E2=80=9Cgnt-cluster=20info=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Let gnt-cluster info show us the per-os-hypervisor parameters.
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
scripts/gnt-cluster | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 4a15d59fe..59b73a7b0 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -207,17 +207,22 @@ def ShowClusterMaster(opts, args):
return 0
-def _PrintGroupedParams(paramsdict):
+def _PrintGroupedParams(paramsdict, level=1):
"""Print Grouped parameters (be, nic, disk) by group.
@type paramsdict: dict of dicts
@param paramsdict: {group: {param: value, ...}, ...}
+ @type level: int
+ @param level: Level of indention
"""
- for gr_name, gr_dict in paramsdict.items():
- ToStdout(" - %s:", gr_name)
- for item, val in gr_dict.iteritems():
- ToStdout(" %s: %s", item, val)
+ indent = " " * level
+ for item, val in paramsdict.items():
+ if isinstance(val, dict):
+ ToStdout("%s- %s:", indent, item)
+ _PrintGroupedParams(val, level=level + 1)
+ else:
+ ToStdout("%s %s: %s", indent, item, val)
def ShowClusterConfig(opts, args):
@@ -258,6 +263,9 @@ def ShowClusterConfig(opts, args):
ToStdout("Hypervisor parameters:")
_PrintGroupedParams(result["hvparams"])
+ ToStdout("OS specific hypervisor parameters:")
+ _PrintGroupedParams(result["os_hvp"])
+
ToStdout("Cluster parameters:")
ToStdout(" - candidate pool size: %s", result["candidate_pool_size"])
ToStdout(" - master netdev: %s", result["master_netdev"])
--
GitLab