bootstrap: Wait for node daemon when adding new node

Until now this was only done for the master node, though
the problem originally fixed in 8f215968

 also occurs for
other node daemons.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

lib/bootstrap.py

@@ -132,17 +132,24 @@ def _InitGanetiServerSetup(master_name):
                              " had exitcode %s and error %s" %
                              (result.cmd, result.exit_code, result.output))
 
-  # Wait for node daemon to become responsive
+  _WaitForNodeDaemon(master_name)
+
+
+def _WaitForNodeDaemon(node_name):
+  """Wait for node daemon to become responsive.
+
+  """
   def _CheckNodeDaemon():
-    result = rpc.RpcRunner.call_version([master_name])[master_name]
+    result = rpc.RpcRunner.call_version([node_name])[node_name]
     if result.fail_msg:
       raise utils.RetryAgain()
 
   try:
     utils.Retry(_CheckNodeDaemon, 1.0, 10.0)
   except utils.RetryTimeout:
-    raise errors.OpExecError("Node daemon didn't answer queries within"
-                             " 10 seconds")
+    raise errors.OpExecError("Node daemon on %s didn't answer queries within"
+                             " 10 seconds" % node_name)
+
 
 def InitCluster(cluster_name, mac_prefix,
                 master_netdev, file_storage_dir, candidate_pool_size,
@@ -426,6 +433,8 @@ def SetupNodeDaemon(cluster_name, node, ssh_key_check):
                              " output: %s" %
                              (node, result.fail_reason, result.output))
 
+  _WaitForNodeDaemon(node)
+
 
 def MasterFailover(no_voting=False):
   """Failover the master node.