On Wed, Oct 14, 2015 at 11:19:56AM +0200, 'Helga Velroyen' via ganeti-devel wrote: > This fixes issue 1131. 'gnt-cluster verify' should stop > complaining about broken SSH setups of offline nodes. > > Additionally, this fixes a problem when readding nodes. > In some cases, Ganeti complains about a possible attack, > which is a valid case for readding a node (if a key > renew took place between offlining and readding the node). > > Signed-off-by: Helga Velroyen <[email protected]> > --- > lib/backend.py | 24 ++++++++++++++++-------- > lib/cmdlib/cluster.py | 2 +- > lib/cmdlib/node.py | 9 ++++++--- > lib/rpc_defs.py | 4 +++- > lib/server/noded.py | 5 +++-- > test/py/ganeti.backend_unittest.py | 6 +++--- > 6 files changed, 32 insertions(+), 18 deletions(-)
LGTM > diff --git a/lib/cmdlib/node.py b/lib/cmdlib/node.py > index 9c2ba21..6578741 100644 > --- a/lib/cmdlib/node.py > +++ b/lib/cmdlib/node.py > @@ -359,7 +359,8 @@ class LUNodeAdd(LogicalUnit): > True, # from authorized keys > True, # from public keys > False, # clear authorized keys > - True) # clear public keys > + True, # clear public keys > + True) # it's a readd Nevertheless, in the long run, we should try to find a way to limit the number positional arguments of the same type. But refactorings are better done on master anyway, so no need to change this 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
