LGTM, thanks
On Thu, Jan 31, 2013 at 1:54 PM, Guido Trotter <[email protected]> wrote: > Specify clearly that the nic parameters depend on the > network-to-nodegroup connection. > > Clarify in gnt-network how instance nics are connected to a network. > > Signed-off-by: Guido Trotter <[email protected]> > --- > man/gnt-instance.rst | 5 ++++- > man/gnt-network.rst | 12 ++++++++++-- > 2 files changed, 14 insertions(+), 3 deletions(-) > > diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst > index 91eadac..1ac094b 100644 > --- a/man/gnt-instance.rst > +++ b/man/gnt-instance.rst > @@ -117,7 +117,10 @@ link > network > derives the mode and the link from the settings of the network > which is identified by its name. If the network option is chosen, > - link and mode must not be specified. > + link and mode must not be specified. Note that the mode and link > + depend on the network-to-nodegroup connection, thus allowing > + different nodegroups to be connected to the same network in > + different ways. > > > Of these "mode" and "link" are nic parameters, and inherit their > diff --git a/man/gnt-network.rst b/man/gnt-network.rst > index fe65e4b..21ca20b 100644 > --- a/man/gnt-network.rst > +++ b/man/gnt-network.rst > @@ -14,8 +14,10 @@ Synopsis > DESCRIPTION > ----------- > > -The **gnt-network** command is used for network definition > -administration in the Ganeti system. > +The **gnt-network** command is used for network definition and > +administration in the Ganeti system. Each instance nic can be connected > +to a network via the ``network`` nic parameter. See **gnt-instance**\(8) > +for more details. > > COMMANDS > -------- > @@ -50,6 +52,12 @@ IPv6 semantics can be assigned to the network via the > ``--network6`` and > ``--gateway6`` options. IP pool is meaningless for IPV6 so those two > values can be used for EUI64 generation from a NIC's MAC address. > > +Note that a when connecting a network to a node group (see below) you > +can specify also the nic mode and link that will be used by instances on > +that group to physically connect to this network. This allows the system > +to work even if the parameters (eg. the VLAN number) change between > +groups. > + > See **ganeti**\(7) for a description of ``--submit`` and other common > options. > > -- > 1.7.10.4 > >
