X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/40a97d80fcb2634779f3de44afad214bdf5288cb..cd098c41522469e462efeb1e157a8718ff7b7809:/lib/bootstrap.py diff --git a/lib/bootstrap.py b/lib/bootstrap.py index 41a1f2c..82d0b18 100644 --- a/lib/bootstrap.py +++ b/lib/bootstrap.py @@ -25,9 +25,9 @@ import os import os.path -import sha import re import logging +import tempfile from ganeti import rpc from ganeti import ssh @@ -37,6 +37,7 @@ from ganeti import config from ganeti import constants from ganeti import objects from ganeti import ssconf +from ganeti import hypervisor def _InitSSHSetup(): @@ -76,15 +77,26 @@ def _GenerateSelfSignedSslCert(file_name, validity=(365 * 5)): @param validity: Validity for certificate in days """ - result = utils.RunCmd(["openssl", "req", "-new", "-newkey", "rsa:1024", - "-days", str(validity), "-nodes", "-x509", - "-keyout", file_name, "-out", file_name, "-batch"]) - if result.failed: - raise errors.OpExecError("Could not generate SSL certificate, command" - " %s had exitcode %s and error message %s" % - (result.cmd, result.exit_code, result.output)) - - os.chmod(file_name, 0400) + (fd, tmp_file_name) = tempfile.mkstemp(dir=os.path.dirname(file_name)) + try: + # Set permissions before writing key + os.chmod(tmp_file_name, 0600) + + result = utils.RunCmd(["openssl", "req", "-new", "-newkey", "rsa:1024", + "-days", str(validity), "-nodes", "-x509", + "-keyout", tmp_file_name, "-out", tmp_file_name, + "-batch"]) + if result.failed: + raise errors.OpExecError("Could not generate SSL certificate, command" + " %s had exitcode %s and error message %s" % + (result.cmd, result.exit_code, result.output)) + + # Make read-only + os.chmod(tmp_file_name, 0400) + + os.rename(tmp_file_name, file_name) + finally: + utils.RemoveFile(tmp_file_name) def _InitGanetiServerSetup(): @@ -96,6 +108,10 @@ def _InitGanetiServerSetup(): """ _GenerateSelfSignedSslCert(constants.SSL_CERT_FILE) + # Don't overwrite existing file + if not os.path.exists(constants.RAPI_CERT_FILE): + _GenerateSelfSignedSslCert(constants.RAPI_CERT_FILE) + result = utils.RunCmd([constants.NODE_INITD_SCRIPT, "restart"]) if result.failed: @@ -106,8 +122,9 @@ def _InitGanetiServerSetup(): def InitCluster(cluster_name, mac_prefix, def_bridge, master_netdev, file_storage_dir, candidate_pool_size, - secondary_ip=None, vg_name=None, beparams=None, hvparams=None, - enabled_hypervisors=None, default_hypervisor=None): + secondary_ip=None, vg_name=None, beparams=None, + nicparams=None, hvparams=None, enabled_hypervisors=None, + default_hypervisor=None, modify_etc_hosts=True): """Initialise the cluster. @type candidate_pool_size: int @@ -188,7 +205,18 @@ def InitCluster(cluster_name, mac_prefix, def_bridge, raise errors.OpPrereqError("Init.d script '%s' missing or not" " executable." % constants.NODE_INITD_SCRIPT) - utils.CheckBEParams(beparams) + dirs = [(constants.RUN_GANETI_DIR, constants.RUN_DIRS_MODE)] + utils.EnsureDirs(dirs) + + utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES) + utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES) + objects.NIC.CheckParameterSyntax(nicparams) + + # hvparams is a mapping of hypervisor->hvparams dict + for hv_name, hv_params in hvparams.iteritems(): + utils.ForceDictType(hv_params, constants.HVS_PARAMETER_TYPES) + hv_class = hypervisor.GetHypervisor(hv_name) + hv_class.CheckParameterSyntax(hv_params) # set up the inter-node password and certificate _InitGanetiServerSetup() @@ -201,7 +229,9 @@ def InitCluster(cluster_name, mac_prefix, def_bridge, f.close() sshkey = sshline.split(" ")[1] - utils.AddHostToEtcHosts(hostname.name) + if modify_etc_hosts: + utils.AddHostToEtcHosts(hostname.name) + _InitSSHSetup() # init of cluster config file @@ -220,16 +250,18 @@ def InitCluster(cluster_name, mac_prefix, def_bridge, file_storage_dir=file_storage_dir, enabled_hypervisors=enabled_hypervisors, default_hypervisor=default_hypervisor, - beparams={constants.BEGR_DEFAULT: beparams}, + beparams={constants.PP_DEFAULT: beparams}, + nicparams={constants.PP_DEFAULT: nicparams}, hvparams=hvparams, candidate_pool_size=candidate_pool_size, + modify_etc_hosts=modify_etc_hosts, ) master_node_config = objects.Node(name=hostname.name, primary_ip=hostname.ip, secondary_ip=secondary_ip, serial_no=1, master_candidate=True, - offline=False, + offline=False, drained=False, ) sscfg = InitConfig(constants.CONFIG_VERSION, @@ -260,7 +292,7 @@ def InitConfig(version, cluster_config, master_node_config, @param cfg_file: configuration file path @rtype: L{ssconf.SimpleConfigWriter} - @returns: initialized config instance + @return: initialized config instance """ nodes = { @@ -306,15 +338,22 @@ def SetupNodeDaemon(cluster_name, node, ssh_key_check): """ sshrunner = ssh.SshRunner(cluster_name) - gntpem = utils.ReadFile(constants.SSL_CERT_FILE) + + noded_cert = utils.ReadFile(constants.SSL_CERT_FILE) + rapi_cert = utils.ReadFile(constants.RAPI_CERT_FILE) + # 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 - if re.search('^!EOF\.', gntpem, re.MULTILINE): + if (re.search('^!EOF\.', noded_cert, re.MULTILINE) or + re.search('^!EOF\.', rapi_cert, re.MULTILINE)): raise errors.OpExecError("invalid PEM encoding in the SSL certificate") - if not gntpem.endswith("\n"): - raise errors.OpExecError("PEM must end with newline") + + if not noded_cert.endswith("\n"): + noded_cert += "\n" + if not rapi_cert.endswith("\n"): + rapi_cert += "\n" # set up inter-node password and certificate and restarts the node daemon # and then connect with ssh to set password and start ganeti-noded @@ -322,8 +361,14 @@ def SetupNodeDaemon(cluster_name, node, ssh_key_check): # either by being constants or by the checks above mycommand = ("umask 077 && " "cat > '%s' << '!EOF.' && \n" - "%s!EOF.\n%s restart" % - (constants.SSL_CERT_FILE, gntpem, + "%s!EOF.\n" + "cat > '%s' << '!EOF.' && \n" + "%s!EOF.\n" + "chmod 0400 %s %s && " + "%s restart" % + (constants.SSL_CERT_FILE, noded_cert, + constants.RAPI_CERT_FILE, rapi_cert, + constants.SSL_CERT_FILE, constants.RAPI_CERT_FILE, constants.NODE_INITD_SCRIPT)) result = sshrunner.Run(node, 'root', mycommand, batch=False, @@ -408,6 +453,22 @@ def MasterFailover(): return rcode +def GetMaster(): + """Returns the current master node. + + This is a separate function in bootstrap since it's needed by + gnt-cluster, and instead of importing directly ssconf, it's better + to abstract it in bootstrap, where we do use ssconf in other + functions too. + + """ + sstore = ssconf.SimpleStore() + + old_master, _ = ssconf.GetMasterAndMyself(sstore) + + return old_master + + def GatherMasterVotes(node_list): """Check the agreement on who is the master.