Oops, I meant this interdiff: diff --git a/NEWS b/NEWS index 3ff51ac..898a739 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,7 @@ Version 2.16.0 beta2 Incompatible/important changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- The options ``--no-node-setup`` of ``gnt-node add`` is deprecated. +- The options ``--no-node-setup`` of ``gnt-node add`` is disabled. Instead, the cluster configuration parameter ``modify_ssh_setup`` is used to determine whether or not to manipulate the SSH setup of a new node. diff --git a/man/gnt-cluster.rst b/man/gnt-cluster.rst index 7b0e135..b50d7d4 100644 --- a/man/gnt-cluster.rst +++ b/man/gnt-cluster.rst @@ -271,7 +271,10 @@ The ``--no-etc-hosts`` option allows you to initialize the cluster without modifying the /etc/hosts file. The ``--no-ssh-init`` option allows you to initialize the cluster -without creating or distributing SSH key pairs. +without creating or distributing SSH key pairs. This also sets the +cluster-wide configuration parameter ``modify ssh setup`` to False. +When adding nodes, Ganeti will consider this parameter to determine +whether to create and distributed SSH key pairs on new nodes as well. The ``--file-storage-dir``, ``--shared-file-storage-dir`` and ``--gluster-storage-dir`` options allow you set the directory to use for diff --git a/man/gnt-node.rst b/man/gnt-node.rst index 0940d7f..bf3fff3 100644 --- a/man/gnt-node.rst +++ b/man/gnt-node.rst @@ -62,13 +62,15 @@ The ``-g (--node-group)`` option is used to add the new node into a specific node group, specified by UUID or name. If only one node group exists you can skip this option, otherwise it's mandatory. -The ``--no-node-setup`` option prevents Ganeti from performing the -initial SSH setup on the new node. This means that Ganeti will not -touch the SSH keys or the ``authorized_keys`` file of the node at -all. Using this option, it lies in the administrators responsibility -to ensure SSH connectivity between the hosts by other means. Note, -that the equivalent of this option in ``gnt-cluster init`` is called -``--no-ssh-init``. +The ``--no-node-setup`` option that used to prevent Ganeti from performing +the initial SSH setup on the new node is no longer valid. Instead, +Ganeti consideres the ``modify ssh setup`` configuration parameter +(which is set using ``--no-ssh-init`` during cluster initialization) +to determine whether or not to do the SSH setup on a new node or not. +If this parameter is set to ``False``, Ganeti will not touch the SSH +keys or the ``authorized_keys`` file of the node at all. Using this option, +it lies in the administrators responsibility to ensure SSH connectivity +between the hosts by other means. The ``vm_capable``, ``master_capable``, ``ndparams``, ``diskstate`` and ``hvstate`` options are described in **ganeti**\(7), and are used to se On Fri, 13 Nov 2015 at 09:42 Helga Velroyen <[email protected]> wrote: > Please consider this changed log message: > > commit fae23f511edb597182807ea7f83788ee20f7ed28 > Author: Helga Velroyen <[email protected]> > Date: Tue Nov 10 11:02:41 2015 +0100 > > Disable --no-node-setup > > This patch disables the option --no-node-setup of > 'gnt-node add'. The option is the equivalent to > --no-ssh-init for 'gnt-cluster init'. However, it > was rather cumbersome for users to remember whether > or not the cluster was initialized with that to > not forget to use this option. Instead making the > user use --no-node-setup, Ganeti shall determine > whether or not to change the SSH setup by reading > the configuration parameter 'modify_ssh_setup' which > is set with --no-ssh-init. > > Signed-off-by: Helga Velroyen <[email protected]> > > > and this interdiff: > > diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py > index 4aa5c62..b1ce8dc 100644 > --- a/lib/client/gnt_node.py > +++ b/lib/client/gnt_node.py > @@ -314,7 +314,7 @@ def AddNode(opts, args): > > if not opts.node_setup: > ToStdout("-- WARNING -- \n" > - "The option --no-node-setup is deprecated. Whether or not > the\n" > + "The option --no-node-setup is disabled. Whether or not > the\n" > "SSH setup is manipulated while adding a node is > determined\n" > "by the 'modify_ssh_setup' value in the cluster-wide\n" > "configuration instead.\n") > > > On Thu, 12 Nov 2015 at 14:37 Klaus Aehlig <[email protected]> wrote: > >> On Wed, Nov 11, 2015 at 04:02:03PM +0100, 'Helga Velroyen' via >> ganeti-devel wrote: >> > This patch deprecates the option --no-node-setup of >> >> s/deprecate/disable >> >> Note that "deprecate" means that it still works but we warn the user >> that it won't work in the next release; this patch, however, already >> disables the functionality. So the log message and the warning have >> to be reworded. Additionally, the change of semantics has also be >> reflected in the man page, not only the NEWS file (as done in the >> last patch). >> >> -- >> Klaus Aehlig >> Google Germany GmbH, Dienerstr. 12, 80331 Muenchen >> Registergericht und -nummer: Hamburg, HRB 86891 >> Sitz der Gesellschaft: Hamburg >> Geschaeftsfuehrer: Matthew Scott Sucherman, Paul Terence Manicle >> > -- > > Helga Velroyen > Software Engineer > [email protected] > > Google Germany GmbH > Dienerstraße 12 > 80331 München > > Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > > Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind, > leiten Sie diese bitte nicht weiter, informieren Sie den Absender und > löschen Sie die E-Mail und alle Anhänge. Vielen Dank. > > This e-mail is confidential. If you are not the right addressee please do > not forward it, please inform the sender, and please erase this e-mail > including any attachments. Thanks. > > -- Helga Velroyen Software Engineer [email protected] Google Germany GmbH Dienerstraße 12 80331 München Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind, leiten Sie diese bitte nicht weiter, informieren Sie den Absender und löschen Sie die E-Mail und alle Anhänge. Vielen Dank. This e-mail is confidential. If you are not the right addressee please do not forward it, please inform the sender, and please erase this e-mail including any attachments. Thanks.
