build_chroot: use APT_INSTALL macro for packet installation

[ganeti-local] / tools / cluster-merge

diff --git a/tools/cluster-merge b/tools/cluster-merge
index 1ff4b64..a4787d4 100755 (executable)
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -41,6 +41,7 @@ from ganeti import errors
 from ganeti import ssh
 from ganeti import utils
 from ganeti import pathutils
+from ganeti import compat
 
 
 _GROUPS_MERGE = "merge"
@@ -134,7 +135,7 @@ class Merger(object):
   """Handling the merge.
 
   """
-  RUNNING_STATUSES = frozenset([
+  RUNNING_STATUSES = compat.UniqueFrozenset([
     constants.INSTST_RUNNING,
     constants.INSTST_ERRORUP,
     ])
@@ -651,7 +652,7 @@ class Merger(object):
       for node in data.nodes:
         logging.info("Readding node %s", node)
         result = utils.RunCmd(["gnt-node", "add", "--readd",
-                               "--no-ssh-key-check", "--force-join", node])
+                               "--no-ssh-key-check", node])
         if result.failed:
           logging.error("%s failed to be readded. Reason: %s, output: %s",
                          node, result.fail_reason, result.output)
@@ -781,28 +782,6 @@ class Merger(object):
     shutil.rmtree(self.work_dir)
 
 
-def SetupLogging(options):
-  """Setting up logging infrastructure.
-
-  @param options: Parsed command line options
-
-  """
-  formatter = logging.Formatter("%(asctime)s: %(levelname)s %(message)s")
-
-  stderr_handler = logging.StreamHandler()
-  stderr_handler.setFormatter(formatter)
-  if options.debug:
-    stderr_handler.setLevel(logging.NOTSET)
-  elif options.verbose:
-    stderr_handler.setLevel(logging.INFO)
-  else:
-    stderr_handler.setLevel(logging.WARNING)
-
-  root_logger = logging.getLogger("")
-  root_logger.setLevel(logging.NOTSET)
-  root_logger.addHandler(stderr_handler)
-
-
 def main():
   """Main routine.
 
@@ -821,7 +800,7 @@ def main():
 
   (options, args) = parser.parse_args()
 
-  SetupLogging(options)
+  utils.SetupToolLogging(options.debug, options.verbose)
 
   if not args:
     parser.error("No clusters specified")