Repository: cloudstack Updated Branches: refs/heads/master 5be7fa23b -> b65ce7e75
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) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b65ce7e7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b65ce7e7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b65ce7e7 Branch: refs/heads/master Commit: b65ce7e756081f96cdc3bcf4753b61c451af8f80 Parents: 5be7fa2 Author: Nitin Mehta <nitin.me...@citrix.com> Authored: Tue Jun 17 16:59:30 2014 -0700 Committer: Nitin Mehta <nitin.me...@citrix.com> Committed: Tue Jun 17 17:00:12 2014 -0700 ---------------------------------------------------------------------- .../cloudstack/core/spring-core-registry-core-context.xml | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b65ce7e7/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml ---------------------------------------------------------------------- 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 d54823a..819fb83 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" />
