From 2827d1ac0ee7669e81e9578829b54626d3062b98 Mon Sep 17 00:00:00 2001
From: Bernardo Dal Seno <bdalseno@google.com>
Date: Wed, 24 Apr 2013 16:08:10 +0200
Subject: [PATCH] cfgupgrade: Remove enabled_disk_templates on downgrade

Remove enabled_disk_templates instead of the deprecated
enabled_storage_types.

Signed-off-by: Bernardo Dal Seno <bdalseno@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
 tools/cfgupgrade | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 3b08701ee..4d80b18ca 100755
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -284,19 +284,20 @@ def DowngradeGroups(config_data):
       DowngradeIPolicy(ipolicy)
 
 
-def DowngradeStorageTypes(cluster):
-  # Remove storage types to downgrade to 2.7
-  if "enabled_storage_types" in cluster:
-    logging.warning("Removing cluster storage types; value = %s",
-                    utils.CommaJoin(cluster["enabled_storage_types"]))
-    del cluster["enabled_storage_types"]
+def DowngradeEnabledTemplates(cluster):
+  # Remove enabled disk templates to downgrade to 2.7
+  edt_key = "enabled_disk_templates"
+  if edt_key in cluster:
+    logging.warning("Removing cluster's enabled disk templates; value = %s",
+                    utils.CommaJoin(cluster[edt_key]))
+    del cluster[edt_key]
 
 
 def DowngradeCluster(config_data):
   cluster = config_data.get("cluster", None)
   if cluster is None:
     raise Error("Cannot find cluster")
-  DowngradeStorageTypes(cluster)
+  DowngradeEnabledTemplates(cluster)
   ipolicy = cluster.get("ipolicy", None)
   if ipolicy:
     DowngradeIPolicy(ipolicy)
-- 
GitLab