From 9b31ca8502ab192d69a9bff3395e3e8e49e01ba1 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Tue, 9 Jun 2009 13:29:40 +0100
Subject: [PATCH] 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: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/objects.py | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/lib/objects.py b/lib/objects.py
index 51ef992cf..cde0779cf 100644
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -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.
--
GitLab