commit 446fd1fedf1011e8bdf0f524a62f095399c1f1d5
Merge: b0a7e37 56ffa79
Author: Klaus Aehlig <[email protected]>
Date: Fri Jan 15 14:59:47 2016 +0100
Merge branch 'stable-2.15' into stable-2.16
* stable-2.15
Catch IOError of SSH files when removing node
Fix renew-crypto on one-node-cluster
ssh_update: log data that is received
Increase timeout of RPC adding/removing keys
After TestNodeModify, fix the pool of master candidates
* stable-2.14
Test disk attachment with different primary nodes
Check for same primary node before disk attachment
Add detach/attach sequence test
Allow disk attachment with external storage
* stable-2.13
Run ssh-key renewal in debug mode during upgrade
* stable-2.12
Increase minimal sizes of test online nodes
Also log the high-level upgrade steps
Add function to provide logged user feedback
Run renew-crypto in upgrades in debug mode
Unconditionally log upgrades at debug level
Document healthy-majority restriction on master-failover
Check for healthy majority on master failover with voting
Add a predicate testing that a majority of nodes is healthy
Fix outdated comment
Pass arguments to correct daemons during master-failover
Fix documentation for master-failover
* stable-2.11
(no changes)
* stable-2.10
KVM: explicitly configure routed NICs late
Signed-off-by: Klaus Aehlig <[email protected]>
diff --cc lib/tools/common.py
index ca8288a,3297025..60fe169
--- a/lib/tools/common.py
+++ b/lib/tools/common.py
@@@ -188,11 -188,17 +188,18 @@@ def LoadData(raw, data_check)
@rtype: dict
"""
- return serializer.LoadAndVerifyJson(raw, data_check)
+ result = None
+ try:
+ result = serializer.LoadAndVerifyJson(raw, data_check)
+ logging.debug("Received data: %s", serializer.DumpJson(result))
+ except Exception as e:
+ logging.warn("Received data is not valid json: %s.", str(raw))
+ raise e
+ return result
-def GenerateRootSshKeys(error_fn, _suffix="", _homedir_fn=None):
+def GenerateRootSshKeys(key_type, key_bits, error_fn, _suffix="",
+ _homedir_fn=None):
"""Generates root's SSH keys for this node.
"""
--
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
