commit a17de24df17bf3f904ba8db9374eb0264a19fac0
Merge: 5029b47 fcac567
Author: Klaus Aehlig <[email protected]>
Date: Thu Jan 21 11:02:48 2016 +0100
Merge branch 'stable-2.16' into stable-2.17
* stable-2.16
Document the increased timeout as an incompatible change
Increase timeouts for luxi by a factor of 3
Do not repeat constants in comments
Send messages as Strings
* 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
Conflicts:
tools/post-upgrade: take all the flags
Signed-off-by: Klaus Aehlig <[email protected]>
diff --cc lib/rpc_defs.py
index 8614a03,71fa231..48f2ecb
--- a/lib/rpc_defs.py
+++ b/lib/rpc_defs.py
@@@ -543,11 -543,9 +543,11 @@@ _NODE_CALLS =
("to_public_keys", None, "Whether the node's key should be added"
" to all nodes' public key file"),
("get_public_keys", None, "Whether the node should get the other nodes'"
- " public keys")],
+ " public keys"),
+ ("debug", None, "Set loglevel of ssh calls to 'debug'."),
+ ("verbose", None, "Set loglevel of ssh calls to 'verbose'.")],
None, None, "Distribute a new node's public SSH key on the cluster."),
- ("node_ssh_key_remove", MULTI, None, constants.RPC_TMO_URGENT, [
+ ("node_ssh_key_remove", MULTI, None, constants.RPC_TMO_FAST, [
("node_uuid", None, "UUID of the node whose key is removed"),
("node_name", None, "Name of the node whose key is removed"),
("master_candidate_uuids", None, "List of UUIDs of master candidates."),
diff --cc tools/post-upgrade
index e0a4b64,4d673e0..41ca528
--- a/tools/post-upgrade
+++ b/tools/post-upgrade
@@@ -63,8 -63,8 +63,9 @@@ def main()
if utils.version.IsBefore(version, 2, 13, 0):
result = utils.RunCmd(["gnt-cluster", "renew-crypto",
- "--new-ssh-keys", "--no-ssh-key-check", "-f",
"-d"])
+ "--new-ssh-keys", "--no-ssh-key-check",
- "--verbose", "-f"])
++ "--verbose", "-f", "-d"])
+
if result.failed:
cli.ToStderr("Failed to create SSH keys: %s; Output %s" %
(result.fail_reason, result.output))
--
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
