X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/ea5fd476ad05e0f5b01051fe38d171eabe69c5dd..91fba1d1813242d7e2ae73f0cee04b65956ab5d8:/tools/sanitize-config?ds=sidebyside

diff --git a/tools/sanitize-config b/tools/sanitize-config
index ca9c955..5556ffb 100755
--- a/tools/sanitize-config
+++ b/tools/sanitize-config
@@ -19,7 +19,7 @@
 # 02110-1301, USA.
 
 
-# pylint: disable-msg=C0103
+# pylint: disable=C0103
 
 """Tool to sanitize/randomize the configuration file.
 
@@ -33,6 +33,7 @@ import optparse
 from ganeti import constants
 from ganeti import serializer
 from ganeti import utils
+from ganeti import pathutils
 from ganeti import cli
 from ganeti.cli import cli_option
 
@@ -40,8 +41,8 @@ from ganeti.cli import cli_option
 OPTS = [
   cli.VERBOSE_OPT,
   cli_option("--path", help="Convert this configuration file"
-             " instead of '%s'" % constants.CLUSTER_CONF_FILE,
-             default=constants.CLUSTER_CONF_FILE, dest="CONFIG_DATA_PATH"),
+             " instead of '%s'" % pathutils.CLUSTER_CONF_FILE,
+             default=pathutils.CLUSTER_CONF_FILE, dest="CONFIG_DATA_PATH"),
   cli_option("--sanitize-names", default="yes", type="bool",
              help="Randomize the cluster, node and instance names [yes]"),
   cli_option("--sanitize-ips", default="yes", type="bool",
@@ -79,11 +80,12 @@ def GenerateNameMap(opts, names, base):
   return name_map
 
 
-def SanitizeSecrets(opts, cfg): # pylint: disable-msg=W0613
+def SanitizeSecrets(opts, cfg): # pylint: disable=W0613
   """Cleanup configuration secrets.
 
   """
   cfg["cluster"]["rsahostkeypub"] = ""
+  cfg["cluster"]["dsahostkeypub"] = ""
   for instance in cfg["instances"].values():
     for disk in instance["disks"]:
       RandomizeDiskSecrets(disk)
@@ -126,7 +128,7 @@ def SanitizeInstances(opts, cfg):
   RenameDictKeys(cfg["instances"], old_map, True)
 
 
-def SanitizeIps(opts, cfg): # pylint: disable-msg=W0613
+def SanitizeIps(opts, cfg): # pylint: disable=W0613
   """Sanitize the IP names.
 
   @note: we're interested in obscuring the old IPs, not in generating
@@ -161,7 +163,7 @@ def SanitizeIps(opts, cfg): # pylint: disable-msg=W0613
         nic["ip"] = _Get(nic["ip"])
 
 
-def SanitizeOsNames(opts, cfg): # pylint: disable-msg=W0613
+def SanitizeOsNames(opts, cfg): # pylint: disable=W0613
   """Sanitize the OS names.
 
   """
@@ -182,7 +184,7 @@ def SanitizeOsNames(opts, cfg): # pylint: disable-msg=W0613
     RenameDictKeys(cfg["cluster"]["os_hvp"], os_map, False)
 
 
-def SanitizeDisks(opts, cfg): # pylint: disable-msg=W0613
+def SanitizeDisks(opts, cfg): # pylint: disable=W0613
   """Cleanup disks disks.
 
   """
@@ -197,11 +199,11 @@ def SanitizeDisks(opts, cfg): # pylint: disable-msg=W0613
       for child in disk["children"]:
         helper(child)
 
-    if disk["dev_type"] == constants.LD_DRBD8:
+    if disk["dev_type"] == constants.DT_DRBD8:
       if "physical_id" in disk:
         del disk["physical_id"]
 
-    if disk["dev_type"] == constants.LD_LV and opts.sanitize_lvs:
+    if disk["dev_type"] == constants.DT_PLAIN and opts.sanitize_lvs:
       disk["logical_id"][1] = _Get(disk["logical_id"][1])
       disk["physical_id"][1] = disk["logical_id"][1]
 
@@ -221,7 +223,7 @@ def RandomizeDiskSecrets(disk):
       RandomizeDiskSecrets(child)
 
   # only disk type to contain secrets is the drbd one
-  if disk["dev_type"] == constants.LD_DRBD8:
+  if disk["dev_type"] == constants.DT_DRBD8:
     disk["logical_id"][5] = utils.GenerateSecret()
 
 
@@ -234,7 +236,7 @@ def RenameDiskNodes(disk, node_map):
       RenameDiskNodes(child, node_map)
 
   # only disk type to contain nodes is the drbd one
-  if disk["dev_type"] == constants.LD_DRBD8:
+  if disk["dev_type"] == constants.DT_DRBD8:
     lid = disk["logical_id"]
     lid[0] = node_map[lid[0]]
     lid[1] = node_map[lid[1]]