From b3f1cf6fdda8be3cb89ac3bd2f4263819b2fa905 Mon Sep 17 00:00:00 2001 From: Iustin Pop Date: Wed, 30 Jul 2008 15:17:58 +0000 Subject: [PATCH] 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 --- lib/bootstrap.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bootstrap.py b/lib/bootstrap.py index 21553e5..35f6917 100644 --- 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. -- 1.7.10.4