X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/b2e233a59249766e85fbbc86fadc04833c3de21a..eaa4c57c43148a196080d69953e652ad755505e2:/lib/bootstrap.py diff --git a/lib/bootstrap.py b/lib/bootstrap.py index bc4fd15..0944fb7 100644 --- a/lib/bootstrap.py +++ b/lib/bootstrap.py @@ -1,7 +1,7 @@ # # -# Copyright (C) 2006, 2007, 2008, 2010, 2011 Google Inc. +# Copyright (C) 2006, 2007, 2008, 2010, 2011, 2012 Google Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -41,9 +41,9 @@ from ganeti import serializer from ganeti import hypervisor from ganeti import bdev from ganeti import netutils -from ganeti import backend from ganeti import luxi from ganeti import jstore +from ganeti import pathutils # ec_id for InitConfig's temporary reservation manager @@ -60,7 +60,7 @@ def _InitSSHSetup(): permitted hosts and adds the hostkey to its own known hosts. """ - priv_key, pub_key, auth_keys = ssh.GetUserFiles(constants.GANETI_RUNAS) + priv_key, pub_key, auth_keys = ssh.GetUserFiles(constants.SSH_LOGIN_USER) for name in priv_key, pub_key: if os.path.exists(name): @@ -92,12 +92,12 @@ def GenerateClusterCrypto(new_cluster_cert, new_rapi_cert, new_spice_cert, new_confd_hmac_key, new_cds, rapi_cert_pem=None, spice_cert_pem=None, spice_cacert_pem=None, cds=None, - nodecert_file=constants.NODED_CERT_FILE, - rapicert_file=constants.RAPI_CERT_FILE, - spicecert_file=constants.SPICE_CERT_FILE, - spicecacert_file=constants.SPICE_CACERT_FILE, - hmackey_file=constants.CONFD_HMAC_KEY, - cds_file=constants.CLUSTER_DOMAIN_SECRET_FILE): + nodecert_file=pathutils.NODED_CERT_FILE, + rapicert_file=pathutils.RAPI_CERT_FILE, + spicecert_file=pathutils.SPICE_CERT_FILE, + spicecacert_file=pathutils.SPICE_CACERT_FILE, + hmackey_file=pathutils.CONFD_HMAC_KEY, + cds_file=pathutils.CLUSTER_DOMAIN_SECRET_FILE): """Updates the cluster certificates, keys and secrets. @type new_cluster_cert: bool @@ -208,7 +208,7 @@ def _InitGanetiServerSetup(master_name): # Generate cluster secrets GenerateClusterCrypto(True, False, False, False, False) - result = utils.RunCmd([constants.DAEMON_UTIL, "start", constants.NODED]) + result = utils.RunCmd([pathutils.DAEMON_UTIL, "start", constants.NODED]) if result.failed: raise errors.OpExecError("Could not start the node daemon, command %s" " had exitcode %s and error %s" % @@ -222,6 +222,8 @@ def _WaitForNodeDaemon(node_name): """ def _CheckNodeDaemon(): + # Pylint bug + # pylint: disable=E1101 result = rpc.BootstrapRunner().call_version([node_name])[node_name] if result.fail_msg: raise utils.RetryAgain() @@ -282,15 +284,16 @@ def _InitFileStorage(file_storage_dir): return file_storage_dir -def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913 +def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913, R0914 master_netmask, master_netdev, file_storage_dir, shared_file_storage_dir, candidate_pool_size, secondary_ip=None, vg_name=None, beparams=None, nicparams=None, ndparams=None, - hvparams=None, enabled_hypervisors=None, modify_etc_hosts=True, - modify_ssh_setup=True, maintain_node_health=False, - drbd_helper=None, uid_pool=None, default_iallocator=None, - primary_ip_version=None, prealloc_wipe_disks=False, - use_external_mip_script=False): + hvparams=None, diskparams=None, enabled_hypervisors=None, + modify_etc_hosts=True, modify_ssh_setup=True, + maintain_node_health=False, drbd_helper=None, uid_pool=None, + default_iallocator=None, primary_ip_version=None, ipolicy=None, + prealloc_wipe_disks=False, use_external_mip_script=False, + hv_state=None, disk_state=None): """Initialise the cluster. @type candidate_pool_size: int @@ -315,17 +318,18 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913 ipcls = netutils.IPAddress.GetClassFromIpVersion(primary_ip_version) except errors.ProgrammerError: raise errors.OpPrereqError("Invalid primary ip version: %d." % - primary_ip_version) + primary_ip_version, errors.ECODE_INVAL) hostname = netutils.GetHostname(family=ipcls.family) if not ipcls.IsValid(hostname.ip): raise errors.OpPrereqError("This host's IP (%s) is not a valid IPv%d" - " address." % (hostname.ip, primary_ip_version)) + " address." % (hostname.ip, primary_ip_version), + errors.ECODE_INVAL) if ipcls.IsLoopback(hostname.ip): raise errors.OpPrereqError("This host's IP (%s) resolves to a loopback" " address. Please fix DNS or %s." % - (hostname.ip, constants.ETC_HOSTS), + (hostname.ip, pathutils.ETC_HOSTS), errors.ECODE_ENVIRON) if not ipcls.Own(hostname.ip): @@ -360,7 +364,8 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913 if master_netmask is not None: if not ipcls.ValidateNetmask(master_netmask): raise errors.OpPrereqError("CIDR netmask (%s) not valid for IPv%s " % - (master_netmask, primary_ip_version)) + (master_netmask, primary_ip_version), + errors.ECODE_INVAL) else: master_netmask = ipcls.iplen @@ -407,27 +412,68 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913 (master_netdev, result.output.strip()), errors.ECODE_INVAL) - dirs = [(constants.RUN_GANETI_DIR, constants.RUN_DIRS_MODE)] + dirs = [(pathutils.RUN_DIR, constants.RUN_DIRS_MODE)] utils.EnsureDirs(dirs) objects.UpgradeBeParams(beparams) utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES) utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES) + objects.NIC.CheckParameterSyntax(nicparams) + full_ipolicy = objects.FillIPolicy(constants.IPOLICY_DEFAULTS, ipolicy) + if ndparams is not None: utils.ForceDictType(ndparams, constants.NDS_PARAMETER_TYPES) else: ndparams = dict(constants.NDC_DEFAULTS) + # This is ugly, as we modify the dict itself + # FIXME: Make utils.ForceDictType pure functional or write a wrapper + # around it + if hv_state: + for hvname, hvs_data in hv_state.items(): + utils.ForceDictType(hvs_data, constants.HVSTS_PARAMETER_TYPES) + hv_state[hvname] = objects.Cluster.SimpleFillHvState(hvs_data) + else: + hv_state = dict((hvname, constants.HVST_DEFAULTS) + for hvname in enabled_hypervisors) + + # FIXME: disk_state has no default values yet + if disk_state: + for storage, ds_data in disk_state.items(): + if storage not in constants.DS_VALID_TYPES: + raise errors.OpPrereqError("Invalid storage type in disk state: %s" % + storage, errors.ECODE_INVAL) + for ds_name, state in ds_data.items(): + utils.ForceDictType(state, constants.DSS_PARAMETER_TYPES) + ds_data[ds_name] = objects.Cluster.SimpleFillDiskState(state) + # 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) + # diskparams is a mapping of disk-template->diskparams dict + for template, dt_params in diskparams.items(): + param_keys = set(dt_params.keys()) + default_param_keys = set(constants.DISK_DT_DEFAULTS[template].keys()) + if not (param_keys <= default_param_keys): + unknown_params = param_keys - default_param_keys + raise errors.OpPrereqError("Invalid parameters for disk template %s:" + " %s" % (template, + utils.CommaJoin(unknown_params)), + errors.ECODE_INVAL) + utils.ForceDictType(dt_params, constants.DISK_DT_TYPES) + try: + utils.VerifyDictOptions(diskparams, constants.DISK_DT_DEFAULTS) + except errors.OpPrereqError, err: + raise errors.OpPrereqError("While verify diskparam options: %s" % err, + errors.ECODE_INVAL) + # set up ssh config and /etc/hosts - sshline = utils.ReadFile(constants.SSH_HOST_RSA_PUB) + sshline = utils.ReadFile(pathutils.SSH_HOST_RSA_PUB) sshkey = sshline.split(" ")[1] if modify_etc_hosts: @@ -473,6 +519,7 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913 nicparams={constants.PP_DEFAULT: nicparams}, ndparams=ndparams, hvparams=hvparams, + diskparams=diskparams, candidate_pool_size=candidate_pool_size, modify_etc_hosts=modify_etc_hosts, modify_ssh_setup=modify_ssh_setup, @@ -485,6 +532,9 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913 primary_ip_family=ipcls.family, prealloc_wipe_disks=prealloc_wipe_disks, use_external_mip_script=use_external_mip_script, + ipolicy=full_ipolicy, + hv_state_static=hv_state, + disk_state_static=disk_state, ) master_node_config = objects.Node(name=hostname.name, primary_ip=hostname.ip, @@ -496,15 +546,15 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913 ) InitConfig(constants.CONFIG_VERSION, cluster_config, master_node_config) cfg = config.ConfigWriter(offline=True) - ssh.WriteKnownHostsFile(cfg, constants.SSH_KNOWN_HOSTS_FILE) + ssh.WriteKnownHostsFile(cfg, pathutils.SSH_KNOWN_HOSTS_FILE) cfg.Update(cfg.GetClusterInfo(), logging.error) - backend.WriteSsconfFiles(cfg.GetSsconfValues()) + ssconf.WriteSsconfFiles(cfg.GetSsconfValues()) # set up the inter-node password and certificate _InitGanetiServerSetup(hostname.name) logging.debug("Starting daemons") - result = utils.RunCmd([constants.DAEMON_UTIL, "start-all"]) + result = utils.RunCmd([pathutils.DAEMON_UTIL, "start-all"]) if result.failed: raise errors.OpExecError("Could not start daemons, command %s" " had exitcode %s and error %s" % @@ -514,7 +564,7 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913 def InitConfig(version, cluster_config, master_node_config, - cfg_file=constants.CLUSTER_CONF_FILE): + cfg_file=pathutils.CLUSTER_CONF_FILE): """Create the initial cluster configuration. It will contain the current node, which will also be the master @@ -542,6 +592,7 @@ def InitConfig(version, cluster_config, master_node_config, uuid=uuid_generator.Generate([], utils.NewUUID, _INITCONF_ECID), name=constants.INITIAL_NODE_GROUP_NAME, members=[master_node_config.name], + diskparams={}, ) nodegroups = { default_nodegroup.uuid: default_nodegroup, @@ -552,6 +603,7 @@ def InitConfig(version, cluster_config, master_node_config, nodegroups=nodegroups, nodes=nodes, instances={}, + networks={}, serial_no=1, ctime=now, mtime=now) utils.WriteFile(cfg_file, @@ -604,28 +656,26 @@ def SetupNodeDaemon(cluster_name, node, ssh_key_check): @param ssh_key_check: whether to do a strict key check """ - family = ssconf.SimpleStore().GetPrimaryIPFamily() + sstore = ssconf.SimpleStore() + family = sstore.GetPrimaryIPFamily() sshrunner = ssh.SshRunner(cluster_name, ipv6=(family == netutils.IP6Address.family)) - bind_address = constants.IP4_ADDRESS_ANY - if family == netutils.IP6Address.family: - bind_address = constants.IP6_ADDRESS_ANY - # set up inter-node password and certificate and restarts the node daemon # and then connect with ssh to set password and start ganeti-noded # note that all the below variables are sanitized at this point, # either by being constants or by the checks above - sshrunner.CopyFileToNode(node, constants.NODED_CERT_FILE) - sshrunner.CopyFileToNode(node, constants.RAPI_CERT_FILE) - sshrunner.CopyFileToNode(node, constants.SPICE_CERT_FILE) - sshrunner.CopyFileToNode(node, constants.SPICE_CACERT_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, - utils.ShellQuote(bind_address))) - - result = sshrunner.Run(node, 'root', mycommand, batch=False, + sshrunner.CopyFileToNode(node, pathutils.NODED_CERT_FILE) + sshrunner.CopyFileToNode(node, pathutils.RAPI_CERT_FILE) + sshrunner.CopyFileToNode(node, pathutils.SPICE_CERT_FILE) + sshrunner.CopyFileToNode(node, pathutils.SPICE_CACERT_FILE) + sshrunner.CopyFileToNode(node, pathutils.CONFD_HMAC_KEY) + for filename in sstore.GetFileList(): + sshrunner.CopyFileToNode(node, filename) + mycommand = ("%s stop-all; %s start %s" % + (pathutils.DAEMON_UTIL, pathutils.DAEMON_UTIL, constants.NODED)) + + result = sshrunner.Run(node, constants.SSH_LOGIN_USER, mycommand, batch=False, ask_key=ssh_key_check, use_cluster_key=True, strict_host_check=ssh_key_check) @@ -667,7 +717,7 @@ def MasterFailover(no_voting=False): " as master candidates. Only these nodes" " can become masters. Current list of" " master candidates is:\n" - "%s" % ('\n'.join(mc_no_master)), + "%s" % ("\n".join(mc_no_master)), errors.ECODE_STATE) if not no_voting: @@ -728,7 +778,7 @@ def MasterFailover(no_voting=False): msg = result.fail_msg if msg: logging.error("Could not disable the master role on the old master" - " %s, please disable manually: %s", old_master, msg) + " %s, please disable manually: %s", old_master, msg) logging.info("Checking master IP non-reachability...")