From e7e8b4dbbffaae2343b63e0452a9b543502614e3 Mon Sep 17 00:00:00 2001 From: Thomas Thrainer <thomasth@google.com> Date: Thu, 23 May 2013 17:43:41 +0200 Subject: [PATCH] Update IAllocator interface documentation Update the missing documentation for the tags fields of node groups. Signed-off-by: Thomas Thrainer <thomasth@google.com> Reviewed-by: Guido Trotter <ultrotter@google.com> (partially cherry picked from commit 2daca99b5be21ea4667637721ee2c65a14444520) Signed-off-by: Thomas Thrainer <thomasth@google.com> Reviewed-by: Guido Trotter <ultrotter@google.com> --- doc/iallocator.rst | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/doc/iallocator.rst b/doc/iallocator.rst index 957c2bb78..09b492aae 100644 --- a/doc/iallocator.rst +++ b/doc/iallocator.rst @@ -111,6 +111,8 @@ nodegroups this attribute in the :manpage:`gnt-group(8)` manpage) ipolicy the instance policy of the node group + tags + the list of node group tags instances a dictionary with the data for the current existing instance on the @@ -377,7 +379,41 @@ time, but not included in further examples below):: "nodegroups": { "f4e06e0d-528a-4963-a5ad-10f3e114232d": { "name": "default", - "alloc_policy": "preferred" + "alloc_policy": "preferred", + "ipolicy": { + "disk-templates": ["drbd", "plain"], + "minmax": [ + { + "max": { + "cpu-count": 2, + "disk-count": 8, + "disk-size": 2048, + "memory-size": 12800, + "nic-count": 8, + "spindle-use": 8 + }, + "min": { + "cpu-count": 1, + "disk-count": 1, + "disk-size": 1024, + "memory-size": 128, + "nic-count": 1, + "spindle-use": 1 + } + } + ], + "spindle-ratio": 32.0, + "std": { + "cpu-count": 1, + "disk-count": 1, + "disk-size": 1024, + "memory-size": 128, + "nic-count": 1, + "spindle-use": 1 + }, + "vcpu-ratio": 4.0 + }, + "tags": ["ng-tag-1", "ng-tag-2"] } }, "instances": { -- GitLab