From be499e31a4e2c0d63fb187342108fbc9046efe08 Mon Sep 17 00:00:00 2001
From: Agata Murawska <agatamurawska@google.com>
Date: Tue, 6 Dec 2011 16:16:57 +0100
Subject: [PATCH] Cluster-level instance policy - other
Signed-off-by: Agata Murawska <agatamurawska@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/client/gnt_cluster.py | 5 +++++
lib/cmdlib.py | 1 +
2 files changed, 6 insertions(+)
diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index 2cdb6fb8a..066013d04 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -448,6 +448,11 @@ def ShowClusterConfig(opts, args):
ToStdout("Default nic parameters:")
_PrintGroupedParams(result["nicparams"], roman=opts.roman_integers)
+ ToStdout("Instance policy - limits for instances:")
+ for key in constants.IPOLICY_PARAMETERS:
+ ToStdout(" - %s", key)
+ _PrintGroupedParams(result["ipolicy"][key], roman=opts.roman_integers)
+
return 0
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index b745ae4ec..faed6d735 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5830,6 +5830,7 @@ class LUClusterQuery(NoHooksLU):
"os_hvp": os_hvp,
"beparams": cluster.beparams,
"osparams": cluster.osparams,
+ "ipolicy": cluster.ipolicy,
"nicparams": cluster.nicparams,
"ndparams": cluster.ndparams,
"candidate_pool_size": cluster.candidate_pool_size,
--
GitLab