Commit 78237f71 authored by Apollon Oikonomopoulos's avatar Apollon Oikonomopoulos Committed by Klaus Aehlig
Browse files

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: default avatarApollon Oikonomopoulos <apoikos@gmail.com>
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parent 3022ea9f
...@@ -307,6 +307,8 @@ def DowngradeCluster(config_data): ...@@ -307,6 +307,8 @@ def DowngradeCluster(config_data):
ipolicy = cluster.get("ipolicy", None) ipolicy = cluster.get("ipolicy", None)
if ipolicy: if ipolicy:
DowngradeIPolicy(ipolicy, "cluster") DowngradeIPolicy(ipolicy, "cluster")
if "dsahostkeypub" in cluster:
del cluster["dsahostkeypub"]
def DowngradeDisk(disk): def DowngradeDisk(disk):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment