From e6244d0000073d6db6dc8989e00fdeb8ff628896 Mon Sep 17 00:00:00 2001 From: Iustin Pop <iustin@google.com> Date: Mon, 23 Jan 2012 18:19:43 +0100 Subject: [PATCH] Export the cluster ipolicy in iallocator And remove a strange comment (the commit which introduced it, d61df03e, doesn't explain it). Also document these new keys in iallocator.rst. Signed-off-by: Iustin Pop <iustin@google.com> Reviewed-by: Michael Hanselmann <hansmi@google.com> --- doc/iallocator.rst | 6 ++++++ lib/cmdlib.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/iallocator.rst b/doc/iallocator.rst index c6b150b84..57a4388d6 100644 --- a/doc/iallocator.rst +++ b/doc/iallocator.rst @@ -90,6 +90,10 @@ cluster_tags enabled_hypervisors the list of enabled hypervisors +ipolicy + the cluster-wide instance policy (for information; the per-node group + values take precedence and should be used instead) + request a dictionary containing the details of the request; the keys vary depending on the type of operation that's being requested, as @@ -105,6 +109,8 @@ nodegroups alloc_policy the allocation policy of the node group (consult the semantics of this attribute in the :manpage:`gnt-group(8)` manpage) + ipolicy + the instance policy of the node group instances a dictionary with the data for the current existing instance on the diff --git a/lib/cmdlib.py b/lib/cmdlib.py index 7e00bf880..47d56744f 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -14343,7 +14343,7 @@ class IAllocator(object): "cluster_name": cfg.GetClusterName(), "cluster_tags": list(cluster_info.GetTags()), "enabled_hypervisors": list(cluster_info.enabled_hypervisors), - # we don't have job IDs + "ipolicy": cluster_info.ipolicy, } ninfo = cfg.GetAllNodesInfo() iinfo = cfg.GetAllInstancesInfo().values() -- GitLab