rapi.client, http.client: Format url correctly when using IPv6

[ganeti-local] / lib / objects.py

diff --git a/lib/objects.py b/lib/objects.py
index 42036e1..8b5e1e7 100644 (file)
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -898,6 +898,7 @@ class Cluster(TaggableObject):
     "tcpudp_port_pool",
     "mac_prefix",
     "volume_group_name",
+    "reserved_lvs",
     "drbd_usermode_helper",
     "default_bridge",
     "default_hypervisor",
@@ -917,6 +918,7 @@ class Cluster(TaggableObject):
     "modify_ssh_setup",
     "maintain_node_health",
     "uid_pool",
+    "default_iallocator",
     ] + _TIMESTAMPS + _UUID
 
   def UpgradeConfig(self):
@@ -975,6 +977,13 @@ class Cluster(TaggableObject):
     if self.uid_pool is None:
       self.uid_pool = []
 
+    if self.default_iallocator is None:
+      self.default_iallocator = ""
+
+    # reserved_lvs added before 2.2
+    if self.reserved_lvs is None:
+      self.reserved_lvs = []
+
   def ToDict(self):
     """Custom function for cluster.