commit 1a40ec0e54cd27a87c44d4ee03b4e0d666d9e65a
Merge: e9ca268 7c02801
Author: Klaus Aehlig <[email protected]>
Date: Thu Oct 16 16:16:03 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.12
Fix FIXME comment
* stable-2.11
break too long line
Read if IPv6 is used directly in SshRunner
* stable-2.10
Check the return value of query in ConnectToInstanceConsole
Conflicts:
lib/bootstrap.py
lib/ssh.py
(all trivial)
diff --cc lib/bootstrap.py
index 4a9b940,4c7b47c..d99568a
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@@ -898,14 -990,11 +899,13 @@@ def SetupNodeDaemon(opts, cluster_name
constants.NDS_START_NODE_DAEMON: True,
}
- RunNodeSetupCmd(cluster_name, node, pathutils.NODE_DAEMON_SETUP,
- opts.debug, opts.verbose,
- True, opts.ssh_key_check, opts.ssh_key_check,
- ssh_port, data)
+ ssconf_store = ssconf.SimpleStore()
- family = ssconf_store.GetPrimaryIPFamily()
+ ssh.RunSshCmdWithStdin(cluster_name, node, pathutils.NODE_DAEMON_SETUP,
+ opts.debug, opts.verbose,
+ True, opts.ssh_key_check, opts.ssh_key_check,
+ ssh_port, data, ssconf_store, ensure_version=True)
- _WaitForSshDaemon(node, ssh_port, family)
++ _WaitForSshDaemon(node, ssh_port)
_WaitForNodeDaemon(node)
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
