Commit 9b31ca85 authored by Guido Trotter's avatar Guido Trotter
Browse files

Remove bridge and default_bridge from objects



These values are deprecated, and not used in 2.1 anymore.
The slots are still there to allow auto-upgrading from 2.0.
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 62f0dd02
......@@ -339,6 +339,10 @@ class NIC(ConfigObject):
if self.bridge is not None:
self.nicparams[constants.NIC_MODE] = constants.NIC_MODE_BRIDGED
self.nicparams[constants.NIC_LINK] = self.bridge
# bridge is no longer used it 2.1. The slot is left there to support
# upgrading, but will be removed in 2.2
if self.bridge is not None:
self.bridge = None
class Disk(ConfigObject):
......@@ -822,6 +826,11 @@ class Cluster(TaggableObject):
if self.modify_etc_hosts is None:
self.modify_etc_hosts = True
# default_bridge is no longer used it 2.1. The slot is left there to
# support auto-upgrading, but will be removed in 2.2
if self.default_bridge is not None:
self.default_bridge = None
def ToDict(self):
"""Custom function for cluster.
......
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