Revision 87622829 lib/bootstrap.py

b/lib/bootstrap.py
271 271
    logging.warning("Could not shutdown the node daemon and cleanup the node")
272 272

  
273 273

  
274
def SetupNodeDaemon(node, ssh_key_check):
274
def SetupNodeDaemon(cluster_name, node, ssh_key_check):
275 275
  """Add a node to the cluster.
276 276

  
277 277
  This function must be called before the actual opcode, and will ssh
278 278
  to the remote node, copy the needed files, and start ganeti-noded,
279 279
  allowing the master to do the rest via normal rpc calls.
280 280

  
281
  Args:
282
    node: fully qualified domain name for the new node
281
  @param cluster_name: the cluster name
282
  @param node: the name of the new node
283
  @param ssh_key_check: whether to do a strict key check
283 284

  
284 285
  """
285
  cfg = ssconf.SimpleConfigReader()
286
  sshrunner = ssh.SshRunner(cfg.GetClusterName())
286
  sshrunner = ssh.SshRunner(cluster_name)
287 287
  gntpem = utils.ReadFile(constants.SSL_CERT_FILE)
288 288
  # in the base64 pem encoding, neither '!' nor '.' are valid chars,
289 289
  # so we use this to detect an invalid certificate; as long as the
......
313 313
                             " output: %s" %
314 314
                             (node, result.fail_reason, result.output))
315 315

  
316
  return 0
317

  
318 316

  
319 317
def MasterFailover():
320 318
  """Failover the master node.

Also available in: Unified diff