from ganeti import bdev
from ganeti import netutils
from ganeti import backend
+from ganeti import luxi
+
# ec_id for InitConfig's temporary reservation manager
_INITCONF_ECID = "initconfig-ecid"
+#: After how many seconds daemon must be responsive
+_DAEMON_READY_TIMEOUT = 10.0
+
def _InitSSHSetup():
"""Setup the SSH configuration for the cluster.
raise utils.RetryAgain()
try:
- utils.Retry(_CheckNodeDaemon, 1.0, 10.0)
+ utils.Retry(_CheckNodeDaemon, 1.0, _DAEMON_READY_TIMEOUT)
except utils.RetryTimeout:
raise errors.OpExecError("Node daemon on %s didn't answer queries within"
- " 10 seconds" % node_name)
+ " %s seconds" % (node_name, _DAEMON_READY_TIMEOUT))
+
+
+def _WaitForMasterDaemon():
+ """Wait for master daemon to become responsive.
+
+ """
+ def _CheckMasterDaemon():
+ try:
+ cl = luxi.Client()
+ (cluster_name, ) = cl.QueryConfigValues(["cluster_name"])
+ except Exception:
+ raise utils.RetryAgain()
+
+ logging.debug("Received cluster name %s from master", cluster_name)
+
+ try:
+ utils.Retry(_CheckMasterDaemon, 1.0, _DAEMON_READY_TIMEOUT)
+ except utils.RetryTimeout:
+ raise errors.OpExecError("Master daemon didn't answer queries within"
+ " %s seconds" % _DAEMON_READY_TIMEOUT)
def _InitFileStorage(file_storage_dir):
return file_storage_dir
-#pylint: disable-msg=R0913
-def InitCluster(cluster_name, mac_prefix,
+def InitCluster(cluster_name, mac_prefix, # pylint: disable-msg=R0913
master_netdev, file_storage_dir, candidate_pool_size,
secondary_ip=None, vg_name=None, beparams=None,
nicparams=None, ndparams=None, hvparams=None,
# set up the inter-node password and certificate
_InitGanetiServerSetup(hostname.name)
- # start the master ip
- # TODO: Review rpc call from bootstrap
- # TODO: Warn on failed start master
- rpc.RpcRunner.call_node_start_master(hostname.name, True, False)
+ logging.debug("Starting daemons")
+ result = utils.RunCmd([constants.DAEMON_UTIL, "start-all"])
+ if result.failed:
+ raise errors.OpExecError("Could not start daemons, command %s"
+ " had exitcode %s and error %s" %
+ (result.cmd, result.exit_code, result.output))
+
+ _WaitForMasterDaemon()
def InitConfig(version, cluster_config, master_node_config,
}
default_nodegroup = objects.NodeGroup(
uuid=uuid_generator.Generate([], utils.NewUUID, _INITCONF_ECID),
- name="default",
+ name=constants.INITIAL_NODE_GROUP_NAME,
members=[master_node_config.name],
)
nodegroups = {
"""
family = ssconf.SimpleStore().GetPrimaryIPFamily()
sshrunner = ssh.SshRunner(cluster_name,
- ipv6=family==netutils.IP6Address.family)
-
- noded_cert = utils.ReadFile(constants.NODED_CERT_FILE)
- rapi_cert = utils.ReadFile(constants.RAPI_CERT_FILE)
- confd_hmac_key = utils.ReadFile(constants.CONFD_HMAC_KEY)
-
- # in the base64 pem encoding, neither '!' nor '.' are valid chars,
- # so we use this to detect an invalid certificate; as long as the
- # cert doesn't contain this, the here-document will be correctly
- # parsed by the shell sequence below. HMAC keys are hexadecimal strings,
- # so the same restrictions apply.
- for content in (noded_cert, rapi_cert, confd_hmac_key):
- if re.search('^!EOF\.', content, re.MULTILINE):
- raise errors.OpExecError("invalid SSL certificate or HMAC key")
-
- if not noded_cert.endswith("\n"):
- noded_cert += "\n"
- if not rapi_cert.endswith("\n"):
- rapi_cert += "\n"
- if not confd_hmac_key.endswith("\n"):
- confd_hmac_key += "\n"
+ ipv6=(family == netutils.IP6Address.family))
bind_address = constants.IP4_ADDRESS_ANY
if family == netutils.IP6Address.family:
sshrunner.CopyFileToNode(node, constants.NODED_CERT_FILE)
sshrunner.CopyFileToNode(node, constants.RAPI_CERT_FILE)
sshrunner.CopyFileToNode(node, constants.CONFD_HMAC_KEY)
- mycommand = ("%s stop-all; %s start %s -b '%s'" % (constants.DAEMON_UTIL,
- constants.DAEMON_UTIL,
- constants.NODED,
- bind_address))
+ mycommand = ("%s stop-all; %s start %s -b %s" %
+ (constants.DAEMON_UTIL, constants.DAEMON_UTIL, constants.NODED,
+ utils.ShellQuote(bind_address)))
result = sshrunner.Run(node, 'root', mycommand, batch=False,
ask_key=ssh_key_check,