Fix cluster init

With the recent changes, I forgot the extra parameter to this rpc call.
Also the rpc call needs to be done after we setup the config data, for
the master daemon to be able to start, so we move it after all other
init steps.

Reviewed-by: ultrotter

diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index 21553e5..35f6917 100644 (file)
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@ -207,10 +207,6 @@ def InitCluster(cluster_name, hypervisor_type, mac_prefix, def_bridge,
   # set up the inter-node password and certificate
   _InitGanetiServerSetup(ss)
 
-  # start the master ip
-  # TODO: Review rpc call from bootstrap
-  rpc.call_node_start_master(hostname.name)
-
   # set up ssh config and /etc/hosts
   f = open(constants.SSH_HOST_RSA_PUB, 'r')
   try:
@@ -229,6 +225,10 @@ def InitCluster(cluster_name, hypervisor_type, mac_prefix, def_bridge,
 
   ssh.WriteKnownHostsFile(cfg, ss, constants.SSH_KNOWN_HOSTS_FILE)
 
+  # start the master ip
+  # TODO: Review rpc call from bootstrap
+  rpc.call_node_start_master(hostname.name, True)
+
 
 def SetupNodeDaemon(node):
   """Add a node to the cluster.