Implement BuildHooksEnv for NoHooksLU

[ganeti-local] / lib / bootstrap.py

diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index a03a433..4fce0d3 100644 (file)
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@ -25,9 +25,9 @@
 
 import os
 import os.path
 
 import os
 import os.path

-import sha

 import re
 import logging
 import re
 import logging

+import tempfile

 
 from ganeti import rpc
 from ganeti import ssh
 
 from ganeti import rpc
 from ganeti import ssh

@@ -37,17 +37,15 @@ from ganeti import config
 from ganeti import constants
 from ganeti import objects
 from ganeti import ssconf
 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.
 
 
   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)
 
   """
   priv_key, pub_key, auth_keys = ssh.GetUserFiles(constants.GANETI_RUNAS)
 

@@ -70,6 +68,40 @@ def _InitSSHSetup(node):
     f.close()
 
 
     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:
+    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)
+  finally:
+    os.close(fd)
+
+

 def _InitGanetiServerSetup():
   """Setup the necessary configuration for the initial node daemon.
 
 def _InitGanetiServerSetup():
   """Setup the necessary configuration for the initial node daemon.
 

@@ -77,16 +109,11 @@ def _InitGanetiServerSetup():
   the cluster and also generates the SSL certificate.
 
   """
   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"])
 
 
   result = utils.RunCmd([constants.NODE_INITD_SCRIPT, "restart"])
 

@@ -97,16 +124,28 @@ def _InitGanetiServerSetup():
 
 
 def InitCluster(cluster_name, mac_prefix, def_bridge,
 
 
 def InitCluster(cluster_name, mac_prefix, def_bridge,

-                master_netdev, file_storage_dir,
-                secondary_ip=None,
-                vg_name=None, beparams=None, hvparams=None,
-                enabled_hypervisors=None, default_hypervisor=None):
+                master_netdev, file_storage_dir, candidate_pool_size,
+                secondary_ip=None, vg_name=None, beparams=None, hvparams=None,
+                enabled_hypervisors=None, default_hypervisor=None,
+                modify_etc_hosts=True):

   """Initialise the cluster.
 
   """Initialise the cluster.
 

+  @type candidate_pool_size: int
+  @param candidate_pool_size: master candidate pool size
+

   """
   """

+  # TODO: complete the docstring

   if config.ConfigWriter.IsCluster():
     raise errors.OpPrereqError("Cluster is already initialised")
 
   if config.ConfigWriter.IsCluster():
     raise errors.OpPrereqError("Cluster is already initialised")
 

+  if not enabled_hypervisors:
+    raise errors.OpPrereqError("Enabled hypervisors list must contain at"
+                               " least one member")
+  invalid_hvs = set(enabled_hypervisors) - constants.HYPER_TYPES
+  if invalid_hvs:
+    raise errors.OpPrereqError("Enabled hypervisors contains invalid"
+                               " entries: %s" % invalid_hvs)
+

   hostname = utils.HostInfo()
 
   if hostname.ip.startswith("127."):
   hostname = utils.HostInfo()
 
   if hostname.ip.startswith("127."):

@@ -177,7 +216,15 @@ def InitCluster(cluster_name, mac_prefix, def_bridge,
     raise errors.OpPrereqError("Init.d script '%s' missing or not"
                                " executable." % constants.NODE_INITD_SCRIPT)
 
     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)
+  # 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()
 
   # set up the inter-node password and certificate
   _InitGanetiServerSetup()

@@ -190,8 +237,10 @@ def InitCluster(cluster_name, mac_prefix, def_bridge,
     f.close()
   sshkey = sshline.split(" ")[1]
 
     f.close()
   sshkey = sshline.split(" ")[1]
 

-  utils.AddHostToEtcHosts(hostname.name)
-  _InitSSHSetup(hostname.name)
+  if modify_etc_hosts:
+    utils.AddHostToEtcHosts(hostname.name)
+
+  _InitSSHSetup()

 
   # init of cluster config file
   cluster_config = objects.Cluster(
 
   # init of cluster config file
   cluster_config = objects.Cluster(

@@ -211,19 +260,26 @@ def InitCluster(cluster_name, mac_prefix, def_bridge,
     default_hypervisor=default_hypervisor,
     beparams={constants.BEGR_DEFAULT: beparams},
     hvparams=hvparams,
     default_hypervisor=default_hypervisor,
     beparams={constants.BEGR_DEFAULT: beparams},
     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,
     )
   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
 
   # start the master ip
   # TODO: Review rpc call from bootstrap

-  rpc.RpcRunner.call_node_start_master(hostname.name, True)
+  rpc.RpcRunner.call_node_start_master(hostname.name, True, False)

 
 
 def InitConfig(version, cluster_config, master_node_config,
 
 
 def InitConfig(version, cluster_config, master_node_config,

@@ -234,16 +290,16 @@ def InitConfig(version, cluster_config, master_node_config,
   node, and no instances.
 
   @type version: int
   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}
+  @return: initialized config instance

 
   """
   nodes = {
 
   """
   nodes = {

@@ -289,15 +345,22 @@ def SetupNodeDaemon(cluster_name, node, ssh_key_check):
 
   """
   sshrunner = ssh.SshRunner(cluster_name)
 
   """
   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
   # 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")
     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
 
   # set up inter-node password and certificate and restarts the node daemon
   # and then connect with ssh to set password and start ganeti-noded

@@ -305,8 +368,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"
   # 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,
                 constants.NODE_INITD_SCRIPT))
 
   result = sshrunner.Run(node, 'root', mycommand, batch=False,

@@ -319,13 +388,17 @@ def SetupNodeDaemon(cluster_name, node, ssh_key_check):
                              (node, result.fail_reason, result.output))
 
 
                              (node, result.fail_reason, result.output))
 
 

-def MasterFailover():
+def MasterFailover(no_voting=False):

   """Failover the master node.
 
   This checks that we are not already the master, and will cause the
   current master to cease being master, and the non-master to become
   new master.
 
   """Failover the master node.
 
   This checks that we are not already the master, and will cause the
   current master to cease being master, and the non-master to become
   new master.
 

+  @type no_voting: boolean
+  @param no_voting: force the operation without remote nodes agreement
+                      (dangerous)
+

   """
   sstore = ssconf.SimpleStore()
 
   """
   sstore = ssconf.SimpleStore()
 

@@ -347,18 +420,20 @@ def MasterFailover():
                                " master candidates is:\n"
                                "%s" % ('\n'.join(mc_no_master)))
 
                                " master candidates is:\n"
                                "%s" % ('\n'.join(mc_no_master)))
 

-  vote_list = GatherMasterVotes(node_list)
-
-  if vote_list:
-    voted_master = vote_list[0][0]
-    if voted_master is None:
-      raise errors.OpPrereqError("Cluster is inconsistent, most nodes did not"
-                                 " respond.")
-    elif voted_master != old_master:
-      raise errors.OpPrereqError("I have wrong configuration, I believe the"
-                                 " master is %s but the other nodes voted for"
-                                 " %s. Please resync the configuration of"
-                                 " this node." % (old_master, voted_master))
+  if not no_voting:
+    vote_list = GatherMasterVotes(node_list)
+
+    if vote_list:
+      voted_master = vote_list[0][0]
+      if voted_master is None:
+        raise errors.OpPrereqError("Cluster is inconsistent, most nodes did"
+                                   " not respond.")
+      elif voted_master != old_master:
+        raise errors.OpPrereqError("I have a wrong configuration, I believe"
+                                   " the master is %s but the other nodes"
+                                   " voted %s. Please resync the configuration"
+                                   " of this node." %
+                                   (old_master, voted_master))

   # end checks
 
   rcode = 0
   # end checks
 
   rcode = 0

@@ -382,7 +457,7 @@ def MasterFailover():
   # cluster info
   cfg.Update(cluster_info)
 
   # cluster info
   cfg.Update(cluster_info)
 

-  result = rpc.RpcRunner.call_node_start_master(new_master, True)
+  result = rpc.RpcRunner.call_node_start_master(new_master, True, no_voting)

   if result.failed or not result.data:
     logging.error("Could not start the master role on the new master"
                   " %s, please check", new_master)
   if result.failed or not result.data:
     logging.error("Could not start the master role on the new master"
                   " %s, please check", new_master)

@@ -391,6 +466,22 @@ def MasterFailover():
   return rcode
 
 
   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.
 
 def GatherMasterVotes(node_list):
   """Check the agreement on who is the master.
 

@@ -407,7 +498,7 @@ def GatherMasterVotes(node_list):
 
   @type node_list: list
   @param node_list: the list of nodes to query for master info; the current
 
   @type node_list: list
   @param node_list: the list of nodes to query for master info; the current

-      node wil be removed if it is in the list
+      node will be removed if it is in the list

   @rtype: list
   @return: list of (node, votes)
 
   @rtype: list
   @return: list of (node, votes)
 

@@ -425,8 +516,6 @@ def GatherMasterVotes(node_list):
     # this should not happen (unless internal error in rpc)
     logging.critical("Can't complete rpc call, aborting master startup")
     return [(None, len(node_list))]
     # 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]
   votes = {}
   for node in results:
     nres = results[node]