Remove dsahostkeypub during config downgrade

Remove the newly-added DSA host public key field from the configuration file
when downgrading to 2.7, if present. Otherwise masterd will refuse to start.

Signed-off-by: Apollon Oikonomopoulos <apoikos@gmail.com>
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 14b2685..6a8d5a4 100755 (executable)
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -307,6 +307,8 @@ def DowngradeCluster(config_data):
   ipolicy = cluster.get("ipolicy", None)
   if ipolicy:
     DowngradeIPolicy(ipolicy, "cluster")
+  if "dsahostkeypub" in cluster:
+    del cluster["dsahostkeypub"]
 
 
 def DowngradeDisk(disk):