On Thu, May 23, 2013 at 9:50 AM, Thomas Thrainer <[email protected]>wrote:
> Document the newly added network field of node groups, and also update > the missing documentation for the other fields of node groups. > > Signed-off-by: Thomas Thrainer <[email protected]> > LGTM It would be ideal to backport the doc fix for current functionality to stable-2.7. Thanks, Guido > --- > doc/iallocator.rst | 41 ++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 40 insertions(+), 1 deletion(-) > > diff --git a/doc/iallocator.rst b/doc/iallocator.rst > index 957c2bb..9958f89 100644 > --- a/doc/iallocator.rst > +++ b/doc/iallocator.rst > @@ -109,8 +109,12 @@ nodegroups > alloc_policy > the allocation policy of the node group (consult the semantics of > this attribute in the :manpage:`gnt-group(8)` manpage) > + networks > + the list of network UUID's this node group is connected to > 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 +381,42 @@ time, but not included in further examples below):: > "nodegroups": { > "f4e06e0d-528a-4963-a5ad-10f3e114232d": { > "name": "default", > - "alloc_policy": "preferred" > + "alloc_policy": "preferred", > + "networks": ["net-uuid-1", "net-uuid-2"], > + "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": { > -- > 1.8.2.1 > > -- Guido Trotter Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Katherine Stephens Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
