With the progressing implementation of the design
'design-node-security.rst', some aspects of the design
were changed or detailed. This patch brings the
design back in sync with the implementation.

Signed-off-by: Helga Velroyen <hel...@google.com>
---
 doc/design-node-security.rst | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/doc/design-node-security.rst b/doc/design-node-security.rst
index 84cce8a..8219f52 100644
--- a/doc/design-node-security.rst
+++ b/doc/design-node-security.rst
@@ -234,7 +234,10 @@ In case of readding a node that used to be in the cluster 
before,
 handling of the SSH keys would basically be the same, in particular also
 a new SSH key pair is generated for the node, because we cannot be sure
 that the old key pair has not been compromised while the node was
-offlined.
+offlined. Note that for reasons of data hygiene, a node that is readded
+ist first cleared of any old Ganeti keys in its ``authorized_keys``
+and ``ganeti_pub_keys`` file. Note that we won't touch any keys that
+were added to the ``authorized_keys`` by other systems than Ganeti.
 
 
 Pro- and demoting a node to/from master candidate
@@ -299,7 +302,7 @@ The same behavior should be ensured for the corresponding 
rapi command.
 Cluster verify
 ~~~~~~~~~~~~~~
 
-So far, 'gnt-cluster verify' checks the SSH connectivity of all nodes to
+So far, ``gnt-cluster verify`` checks the SSH connectivity of all nodes to
 all other nodes. We propose to replace this by the following checks:
 
 - For all master candidates, we check if they can connect any other node
@@ -340,7 +343,7 @@ will be backed up and not simply overridden.
 Downgrades
 ~~~~~~~~~~
 
-These downgrading steps will be implemtented from 2.12 to 2.11:
+These downgrading steps will be implemtented from 2.13 to 2.12:
 
 - The master node's private/public key pair will be distributed to all
   nodes (via SSH) and the individual SSH keys will be backed up.
@@ -351,8 +354,26 @@ These downgrading steps will be implemtented from 2.12 to 
2.11:
 Renew-Crypto
 ~~~~~~~~~~~~
 
-The ``gnt-cluster renew-crypto`` command is not affected by the proposed
-changes related to SSH.
+The ``gnt-cluster renew-crypto`` command will be extended by a new
+option ``--new-ssh-keys``, which will renew all SSH keys on all nodes
+and rebuild the ``authorized_keys`` files and the ``ganeti_pub_keys``
+files according to the previous sections. This operation will be
+performed considering the already stated security considerations, for
+example minimizing RPC calls, distribution of keys via SSH only etc.
+
+
+Compliance to --no-ssh-init and --no-node-setup
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+With this design, Ganeti will do more manipulations of SSH keys and
+``authorized_keys`` files than before. If this is not feasible in
+a Ganeti environment, the administrator has the option to prevent
+Ganeti from performing any manipulations on the SSH setup of the nodes.
+The options for doing so, are ``--no-ssh-init`` for ``gnt-cluster
+init``, and ``--no-node-setup`` for ``gnt-node add``. Note that
+these options already existed before the implementation of this
+design, we just confirm that they will be complied to with the
+new design as well.
 
 
 Proposal regarding node daemon certificates
-- 
2.1.0.rc2.206.gedb03e5

Reply via email to