Refactor hotplug implementation

[ganeti-local] / tools / cfgupgrade

diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 81dce1d..4196e6c 100755 (executable)
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -95,6 +95,16 @@ def CheckHostname(path):
   return False
 
 
+def UpgradeInstances(config_data):
+  for instance in config_data["instances"].values():
+    hotplug_info = instance.get("hotplug_info", None)
+    if hotplug_info:
+      try:
+        del hotplug_info["pci_pool"]
+      except:
+        pass
+
+
 def main():
   """Main program.
 
@@ -237,6 +247,8 @@ def main():
     if not options.dry_run:
       utils.RemoveFile(options.WATCHER_STATEFILE)
 
+  UpgradeInstances(config_data)
+
   try:
     logging.info("Writing configuration file to %s", options.CONFIG_DATA_PATH)
     utils.WriteFile(file_name=options.CONFIG_DATA_PATH,