>
> The LXC downgrade function should be removed as well.
So I'll add the following interdiff
diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 8f6a20e..7c1a119 100755
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -569,34 +569,6 @@ def DowngradeForthcomingDisks(config_data):
inst["disks"].remove(uuid)
-def DowngradeLxcParams(hvparams):
- hv = "lxc"
- if hv not in hvparams:
- return
-
- params_to_del = [
- "devices",
- "drop_capabilities",
- "extra_cgroups",
- "extra_config",
- "num_ttys",
- "startup_timeout",
- ]
- for param in params_to_del:
- if param in hvparams[hv]:
- del hvparams[hv][param]
-
-
-def DowngradeAllLxcParams(config_data):
- cluster = config_data["cluster"]
- if "hvparams" in cluster:
- DowngradeLxcParams(cluster["hvparams"])
-
- for iobj in cluster.get("instances", {}):
- if "hvparams" in iobj:
- DowngradeLxcParams(iobj["hvparams"])
-
-
def DowngradeAll(config_data):
config_data["version"] = version.BuildVersion(DOWNGRADE_MAJOR,
DOWNGRADE_MINOR, 0)
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
