import sha
import re
import logging
+import tempfile
from ganeti import rpc
from ganeti import ssh
from ganeti import constants
from ganeti import objects
from ganeti import ssconf
+from ganeti import hypervisor
-def _InitSSHSetup(node):
- """Setup the SSH configuration for the cluster.
+def _InitSSHSetup():
+ """Setup the SSH configuration for the cluster.
This generates a dsa keypair for root, adds the pub key to the
permitted hosts and adds the hostkey to its own known hosts.
- Args:
- node: the name of this host as a fqdn
-
"""
priv_key, pub_key, auth_keys = ssh.GetUserFiles(constants.GANETI_RUNAS)
f.close()
+def _GenerateSelfSignedSslCert(file_name, validity=(365 * 5)):
+ """Generates a self-signed SSL certificate.
+
+ @type file_name: str
+ @param file_name: Path to output file
+ @type validity: int
+ @param validity: Validity for certificate in days
+
+ """
+ (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():
"""Setup the necessary configuration for the initial node daemon.
the cluster and also generates the SSL certificate.
"""
- result = utils.RunCmd(["openssl", "req", "-new", "-newkey", "rsa:1024",
- "-days", str(365*5), "-nodes", "-x509",
- "-keyout", constants.SSL_CERT_FILE,
- "-out", constants.SSL_CERT_FILE, "-batch"])
- if result.failed:
- raise errors.OpExecError("could not generate server ssl cert, command"
- " %s had exitcode %s and error message %s" %
- (result.cmd, result.exit_code, result.output))
+ _GenerateSelfSignedSslCert(constants.SSL_CERT_FILE)
- os.chmod(constants.SSL_CERT_FILE, 0400)
+ # 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"])
raise errors.OpPrereqError("Init.d script '%s' missing or not"
" executable." % constants.NODE_INITD_SCRIPT)
- utils.CheckBEParams(beparams)
+ utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES)
+ # 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()
sshkey = sshline.split(" ")[1]
utils.AddHostToEtcHosts(hostname.name)
- _InitSSHSetup(hostname.name)
+ _InitSSHSetup()
# init of cluster config file
cluster_config = objects.Cluster(
master_node_config = objects.Node(name=hostname.name,
primary_ip=hostname.ip,
secondary_ip=secondary_ip,
- serial_no=1)
-
- cfg = InitConfig(constants.CONFIG_VERSION,
- cluster_config, master_node_config)
- ssh.WriteKnownHostsFile(cfg, constants.SSH_KNOWN_HOSTS_FILE)
+ serial_no=1,
+ master_candidate=True,
+ offline=False, drained=False,
+ )
+
+ sscfg = InitConfig(constants.CONFIG_VERSION,
+ cluster_config, master_node_config)
+ ssh.WriteKnownHostsFile(sscfg, constants.SSH_KNOWN_HOSTS_FILE)
+ cfg = config.ConfigWriter()
+ cfg.Update(cfg.GetClusterInfo())
# start the master ip
# TODO: Review rpc call from bootstrap
node, and no instances.
@type version: int
- @param version: Configuration version
- @type cluster_config: objects.Cluster
- @param cluster_config: Cluster configuration
- @type master_node_config: objects.Node
- @param master_node_config: Master node configuration
- @type file_name: string
- @param file_name: Configuration file path
+ @param version: configuration version
+ @type cluster_config: L{objects.Cluster}
+ @param cluster_config: cluster configuration
+ @type master_node_config: L{objects.Node}
+ @param master_node_config: master node configuration
+ @type cfg_file: string
+ @param cfg_file: configuration file path
- @rtype: ssconf.SimpleConfigWriter
- @returns: Initialized config instance
+ @rtype: L{ssconf.SimpleConfigWriter}
+ @returns: initialized config instance
"""
nodes = {
"""
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
# 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,
# this should not happen (unless internal error in rpc)
logging.critical("Can't complete rpc call, aborting master startup")
return [(None, len(node_list))]
- positive = negative = 0
- other_masters = {}
votes = {}
for node in results:
nres = results[node]
projects / ganeti-local / blobdiff