Convert os api version file name to a constant

[ganeti-local] / lib / bootstrap.py

diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index 06fd292..b228433 100644 (file)
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@ -28,6 +28,7 @@ import os.path
 import re
 import logging
 import tempfile
 import re
 import logging
 import tempfile

+import time

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

@@ -62,11 +63,7 @@ def _InitSSHSetup():
     raise errors.OpExecError("Could not generate ssh keypair, error %s" %
                              result.output)
 
     raise errors.OpExecError("Could not generate ssh keypair, error %s" %
                              result.output)
 

-  f = open(pub_key, 'r')
-  try:
-    utils.AddAuthorizedKey(auth_keys, f.read(8192))
-  finally:
-    f.close()
+  utils.AddAuthorizedKey(auth_keys, utils.ReadFile(pub_key))

 
 
 def _GenerateSelfSignedSslCert(file_name, validity=(365 * 5)):
 
 
 def _GenerateSelfSignedSslCert(file_name, validity=(365 * 5)):

@@ -239,11 +236,7 @@ def InitCluster(cluster_name, mac_prefix,
   _InitGanetiServerSetup()
 
   # set up ssh config and /etc/hosts
   _InitGanetiServerSetup()
 
   # set up ssh config and /etc/hosts

-  f = open(constants.SSH_HOST_RSA_PUB, 'r')
-  try:
-    sshline = f.read()
-  finally:
-    f.close()
+  sshline = utils.ReadFile(constants.SSH_HOST_RSA_PUB)

   sshkey = sshline.split(" ")[1]
 
   if modify_etc_hosts:
   sshkey = sshline.split(" ")[1]
 
   if modify_etc_hosts:

@@ -251,6 +244,8 @@ def InitCluster(cluster_name, mac_prefix,
 
   _InitSSHSetup()
 
 
   _InitSSHSetup()
 

+  now = time.time()
+

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

@@ -270,6 +265,9 @@ def InitCluster(cluster_name, mac_prefix,
     hvparams=hvparams,
     candidate_pool_size=candidate_pool_size,
     modify_etc_hosts=modify_etc_hosts,
     hvparams=hvparams,
     candidate_pool_size=candidate_pool_size,
     modify_etc_hosts=modify_etc_hosts,

+    ctime=now,
+    mtime=now,
+    uuid=utils.NewUUID(),

     )
   master_node_config = objects.Node(name=hostname.name,
                                     primary_ip=hostname.ip,
     )
   master_node_config = objects.Node(name=hostname.name,
                                     primary_ip=hostname.ip,

@@ -310,11 +308,13 @@ def InitConfig(version, cluster_config, master_node_config,
     master_node_config.name: master_node_config,
     }
 
     master_node_config.name: master_node_config,
     }
 

+  now = time.time()

   config_data = objects.ConfigData(version=version,
                                    cluster=cluster_config,
                                    nodes=nodes,
                                    instances={},
   config_data = objects.ConfigData(version=version,
                                    cluster=cluster_config,
                                    nodes=nodes,
                                    instances={},

-                                   serial_no=1)
+                                   serial_no=1,
+                                   ctime=now, mtime=now)

   utils.WriteFile(cfg_file,
                   data=serializer.Dump(config_data.ToDict()),
                   mode=0600)
   utils.WriteFile(cfg_file,
                   data=serializer.Dump(config_data.ToDict()),
                   mode=0600)

@@ -328,11 +328,11 @@ def FinalizeClusterDestroy(master):
 
   """
   result = rpc.RpcRunner.call_node_stop_master(master, True)
 
   """
   result = rpc.RpcRunner.call_node_stop_master(master, True)

-  msg = result.RemoteFailMsg()
+  msg = result.fail_msg

   if msg:
     logging.warning("Could not disable the master role: %s" % msg)
   result = rpc.RpcRunner.call_node_leave_cluster(master)
   if msg:
     logging.warning("Could not disable the master role: %s" % msg)
   result = rpc.RpcRunner.call_node_leave_cluster(master)

-  msg = result.RemoteFailMsg()
+  msg = result.fail_msg

   if msg:
     logging.warning("Could not shutdown the node daemon and cleanup"
                     " the node: %s", msg)
   if msg:
     logging.warning("Could not shutdown the node daemon and cleanup"
                     " the node: %s", msg)

@@ -354,19 +354,23 @@ def SetupNodeDaemon(cluster_name, node, ssh_key_check):
 
   noded_cert = utils.ReadFile(constants.SSL_CERT_FILE)
   rapi_cert = utils.ReadFile(constants.RAPI_CERT_FILE)
 
   noded_cert = utils.ReadFile(constants.SSL_CERT_FILE)
   rapi_cert = utils.ReadFile(constants.RAPI_CERT_FILE)

+  hmac_key = utils.ReadFile(constants.HMAC_CLUSTER_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
 
   # 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\.', noded_cert, re.MULTILINE) or
-      re.search('^!EOF\.', rapi_cert, re.MULTILINE)):
-    raise errors.OpExecError("invalid PEM encoding in the SSL certificate")
+  # parsed by the shell sequence below. HMAC keys are hexadecimal strings,
+  # so the same restrictions apply.
+  for content in (noded_cert, rapi_cert, 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 noded_cert.endswith("\n"):
     noded_cert += "\n"
   if not rapi_cert.endswith("\n"):
     rapi_cert += "\n"

+  if not hmac_key.endswith("\n"):
+    hmac_key += "\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

@@ -377,11 +381,15 @@ def SetupNodeDaemon(cluster_name, node, ssh_key_check):
                "%s!EOF.\n"
                "cat > '%s' << '!EOF.' && \n"
                "%s!EOF.\n"
                "%s!EOF.\n"
                "cat > '%s' << '!EOF.' && \n"
                "%s!EOF.\n"

-               "chmod 0400 %s %s && "
+               "cat > '%s' << '!EOF.' && \n"
+               "%s!EOF.\n"
+               "chmod 0400 %s %s %s && "

                "%s restart" %
                (constants.SSL_CERT_FILE, noded_cert,
                 constants.RAPI_CERT_FILE, rapi_cert,
                "%s restart" %
                (constants.SSL_CERT_FILE, noded_cert,
                 constants.RAPI_CERT_FILE, rapi_cert,

+                constants.HMAC_CLUSTER_KEY, hmac_key,

                 constants.SSL_CERT_FILE, constants.RAPI_CERT_FILE,
                 constants.SSL_CERT_FILE, constants.RAPI_CERT_FILE,

+                constants.HMAC_CLUSTER_KEY,

                 constants.NODE_INITD_SCRIPT))
 
   result = sshrunner.Run(node, 'root', mycommand, batch=False,
                 constants.NODE_INITD_SCRIPT))
 
   result = sshrunner.Run(node, 'root', mycommand, batch=False,

@@ -447,7 +455,7 @@ def MasterFailover(no_voting=False):
   logging.info("Setting master to %s, old master: %s", new_master, old_master)
 
   result = rpc.RpcRunner.call_node_stop_master(old_master, True)
   logging.info("Setting master to %s, old master: %s", new_master, old_master)
 
   result = rpc.RpcRunner.call_node_stop_master(old_master, True)

-  msg = result.RemoteFailMsg()
+  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)
   if msg:
     logging.error("Could not disable the master role on the old master"
                  " %s, please disable manually: %s", old_master, msg)

@@ -465,7 +473,7 @@ def MasterFailover(no_voting=False):
   cfg.Update(cluster_info)
 
   result = rpc.RpcRunner.call_node_start_master(new_master, True, no_voting)
   cfg.Update(cluster_info)
 
   result = rpc.RpcRunner.call_node_start_master(new_master, True, no_voting)

-  msg = result.RemoteFailMsg()
+  msg = result.fail_msg

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

@@ -528,7 +536,7 @@ def GatherMasterVotes(node_list):
   for node in results:
     nres = results[node]
     data = nres.payload
   for node in results:
     nres = results[node]
     data = nres.payload

-    msg = nres.RemoteFailMsg()
+    msg = nres.fail_msg

     fail = False
     if msg:
       logging.warning("Error contacting node %s: %s", node, msg)
     fail = False
     if msg:
       logging.warning("Error contacting node %s: %s", node, msg)