diff --git a/doc/iallocator.rst b/doc/iallocator.rst index c6b150b8424d93b7afd50b4839a2ff11d9041b15..57a4388d631dee4e360cba293142022246a1cfae 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 7e00bf880ea2344e7e874a17ef2ad1786b1840f7..47d56744f9911f2ddabadad60adf73d95645e371 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()