Commit 5dbee5ea authored by Iustin Pop's avatar Iustin Pop

Ensure that disk.params is always defined (and a dict)

Commit cce46164 fixed upgrading from other 2.6 versions, but
accidentally broke upgrading from 2.5 (disk.params was left as None,
which breaks FillDict). The simplest way to handle params is to always
set them to an empty dict (disregarding what they currently contain).
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parent 1b5b1c49
......@@ -845,8 +845,7 @@ class Disk(ConfigObject):
child.UpgradeConfig()
# FIXME: Make this configurable in Ganeti 2.7
if self.params:
self.params = {}
self.params = {}
# add here config upgrade for this disk
@staticmethod
......
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