From f4c9af7aca9857d775f878423e775f79b0175d15 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Mon, 6 Sep 2010 15:20:03 +0100
Subject: [PATCH] Cluster.UpgradeConfig: populate primary_ip_family
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/objects.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/lib/objects.py b/lib/objects.py
index d59f41754..90e9a6af9 100644
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -41,6 +41,8 @@ from cStringIO import StringIO
from ganeti import errors
from ganeti import constants
+from socket import AF_INET
+
__all__ = ["ConfigObject", "ConfigData", "NIC", "Disk", "Instance",
"OS", "Node", "Cluster", "FillDict"]
@@ -985,6 +987,10 @@ class Cluster(TaggableObject):
if self.reserved_lvs is None:
self.reserved_lvs = []
+ # 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.
--
GitLab