commit 57141535277825d71f8aff10aa99904d40073197
Merge: 8d9a0b5 6952c90
Author: Klaus Aehlig <[email protected]>
Date: Wed Jan 21 16:25:55 2015 +0100
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
Ingore automatically generated tools/shebang
Auto-upgrade hv_state_static and disk_state_static
Conflicts:
lib/objects.py: take both additions
Signed-off-by: Klaus Aehlig <[email protected]>
diff --cc lib/objects.py
index f597daa,d9e754f..41f2ad4
--- a/lib/objects.py
+++ b/lib/objects.py
@@@ -1731,15 -1719,12 +1731,21 @@@ class Cluster(TaggableObject)
raise errors.ConfigurationError(msg)
self.ipolicy = FillIPolicy(constants.IPOLICY_DEFAULTS, self.ipolicy)
+ # hv_state_static added in 2.7
+ if self.hv_state_static is None:
+ self.hv_state_static = {}
+ if self.disk_state_static is None:
+ self.disk_state_static = {}
+
+ if self.candidate_certs is None:
+ self.candidate_certs = {}
+
+ if self.max_running_jobs is None:
+ self.max_running_jobs = constants.LUXID_MAXIMAL_RUNNING_JOBS_DEFAULT
+
+ if self.enabled_user_shutdown is None:
+ self.enabled_user_shutdown = False
+
@property
def primary_hypervisor(self):
"""The first hypervisor is the primary.
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
