Commit cce46164 authored by René Nussbaumer's avatar René Nussbaumer
Browse files

Fix UpgradeConfig of Disk object regards disk params



This bug was found during disk parameter debugging. While looking at the
config some values seem present on the disk parameters, but that's not
expected behaviour. This patch fixes this, and also fixes the "broken"
configs automatically upon masterd restart.
Signed-off-by: default avatarRené Nussbaumer <rn@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 88e14195
......@@ -844,11 +844,9 @@ class Disk(ConfigObject):
for child in self.children:
child.UpgradeConfig()
if not self.params:
self.params = constants.DISK_LD_DEFAULTS[self.dev_type].copy()
else:
self.params = FillDict(constants.DISK_LD_DEFAULTS[self.dev_type],
self.params)
# FIXME: Make this configurable in Ganeti 2.7
if 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