From b65ce7e756081f96cdc3bcf4753b61c451af8f80 Mon Sep 17 00:00:00 2001
From: Nitin Mehta <nitin.mehta@citrix.com>
Date: Tue, 17 Jun 2014 16:59:30 -0700
Subject: [PATCH] CLOUDSTACK-6929: HAPlanner (SkipHeuresticsPlanner) gets added
 into the list of regular planners currently, add it in the exclude list. Also
 create allocator order list (cherry picked from commit
 6fca4eb0f1193b4612d1057784d24d7db1d7b048)

---
 .../cloudstack/core/spring-core-registry-core-context.xml      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
index d54823a33ef..819fb830d5d 100644
--- a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
+++ b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
@@ -75,6 +75,7 @@
         <property name="orderConfigDefault"
             value="FirstFitPlanner,UserDispersingPlanner,UserConcentratedPodPlanner,ImplicitDedicationPlanner,BareMetalPlanner" />
         <property name="excludeKey" value="deployment.planners.exclude" />
+	<property name="excludeDefault" value="SkipHeuresticsPlanner" />
     </bean>
 
     <bean id="haPlannersRegistry"
@@ -89,6 +90,8 @@
 
     <bean id="hostAllocatorsRegistry"
         class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
+	<property name="orderConfigKey" value="host.allocators.order" />
+        <property name="orderConfigDefault" value="FirstFitRouting" />
         <property name="excludeKey" value="host.allocators.exclude" />
         <property name="excludeDefault"
             value="RandomAllocator,TestingAllocator,FirstFitAllocator,RecreateHostAllocator" />