commit cd6c7b806f0e680ba1a5c496f3e64b7dfd2c6e73
Merge: df5758b 87b2cd4
Author: Iustin Pop <[email protected]>
Date: Tue Oct 5 11:14:17 2010 +0200
Merge branch 'devel-2.2'
* devel-2.2:
Rename the _oss cluster vars to _os
Conflicts:
lib/objects.py (trivial, strange that this one, and only this one,
conflicted)
diff --cc lib/objects.py
index 827f680,01c914d..612198a
--- a/lib/objects.py
+++ b/lib/objects.py
@@@ -1003,9 -957,8 +1003,9 @@@ class Cluster(TaggableObject)
"maintain_node_health",
"uid_pool",
"default_iallocator",
+ "hidden_os",
+ "blacklisted_os",
+ "primary_ip_family",
- "hidden_oss",
- "blacklisted_oss",
] + _TIMESTAMPS + _UUID
def UpgradeConfig(self):
@@@ -1072,16 -1025,12 +1072,16 @@@
self.reserved_lvs = []
# hidden and blacklisted operating systems added before 2.2.1
- if self.hidden_oss is None:
- self.hidden_oss = []
+ if self.hidden_os is None:
+ self.hidden_os = []
- if self.blacklisted_oss is None:
- self.blacklisted_oss = []
+ if self.blacklisted_os is None:
+ self.blacklisted_os = []
+ # primary_ip_family added before 2.3
+ if self.primary_ip_family is None:
+ self.primary_ip_family = AF_INET
+
def ToDict(self):
"""Custom function for cluster.
