From 406a9c917ef7e9a3310647a965590e7ce0b4a465 Mon Sep 17 00:00:00 2001 From: Michael Hanselmann <hansmi@google.com> Date: Thu, 1 Dec 2011 14:11:06 +0100 Subject: [PATCH] =?UTF-8?q?cmdlib:=20Make=20use=20of=20cluster's=20new=20?= =?UTF-8?q?=E2=80=9Cprimary=5Fhypervisor=E2=80=9D=20property?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Hanselmann <hansmi@google.com> Reviewed-by: Iustin Pop <iustin@google.com> --- lib/cmdlib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cmdlib.py b/lib/cmdlib.py index 1fbdc2883..e04f46cc9 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -5713,7 +5713,7 @@ class LUClusterQuery(NoHooksLU): "architecture": (platform.architecture()[0], platform.machine()), "name": cluster.cluster_name, "master": cluster.master_node, - "default_hypervisor": cluster.enabled_hypervisors[0], + "default_hypervisor": cluster.primary_hypervisor, "enabled_hypervisors": cluster.enabled_hypervisors, "hvparams": dict([(hypervisor_name, cluster.hvparams[hypervisor_name]) for hypervisor_name in cluster.enabled_hypervisors]), @@ -13668,7 +13668,7 @@ class IAllocator(object): elif self.mode == constants.IALLOCATOR_MODE_RELOC: hypervisor_name = cfg.GetInstanceInfo(self.name).hypervisor else: - hypervisor_name = cluster_info.enabled_hypervisors[0] + hypervisor_name = cluster_info.primary_hypervisor node_data = self.rpc.call_node_info(node_list, [cfg.GetVGName()], [hypervisor_name]) -- GitLab