LGTM, thanks
On Oct 8, 2014 4:01 PM, "'Klaus Aehlig' via ganeti-devel" <
ganeti-devel@googlegroups.com> wrote:
> In commit 937ff984 a new kvm hypervisor parameter, "migration_caps",
> was introduced. However, this parameter was not removed in the downgrade
> function. Add this removal now.
>
> Signed-off-by: Klaus Aehlig <aeh...@google.com>
> ---
> tools/cfgupgrade | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/tools/cfgupgrade b/tools/cfgupgrade
> index 8b29e51..e503ec5 100755
> --- a/tools/cfgupgrade
> +++ b/tools/cfgupgrade
> @@ -466,12 +466,21 @@ def DowngradeNodeParams(config_object):
> del config_object["ndparams"]["cpu_speed"]
>
>
> +def DowngradeHVParams(cluster):
> + """Downgrade newly introduced HV parameters"""
> + if "kvm" in cluster["hvparams"]:
> + kvm_params = cluster["hvparams"]["kvm"]
> + if "migration_caps" in kvm_params:
> + del kvm_params["migration_caps"]
> +
> +
> def DowngradeCluster(config_data):
> cluster = config_data.get("cluster", None)
> if not cluster:
> raise Error("Cannot find the 'cluster' key in the configuration")
>
> DowngradeNodeParams(cluster)
> + DowngradeHVParams(cluster)
>
> if "osparams_private_cluster" in cluster:
> del cluster["osparams_private_cluster"]
> --
> 2.1.0.rc2.206.gedb03e5
>
>
