From 51aa401ff1bc5a217c53dcdfe74c3d13a6a991f6 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Tue, 6 Mar 2012 12:45:19 -0800
Subject: [PATCH] Use the suggested default scheduler

Change-Id: I99de26ab653e670576e0825ad35b0a67eacda6f7
---
 stack.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/stack.sh b/stack.sh
index c7529b8c36..eead8a199f 100755
--- a/stack.sh
+++ b/stack.sh
@@ -195,9 +195,9 @@ INSTANCE_NAME_PREFIX=${INSTANCE_NAME_PREFIX:-instance-}
 VIRT_DRIVER=${VIRT_DRIVER:-libvirt}
 LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm}
 
-# nova supports pluggable schedulers.  ``SimpleScheduler`` should work in most
-# cases unless you are working on multi-zone mode.
-SCHEDULER=${SCHEDULER:-nova.scheduler.simple.SimpleScheduler}
+# Nova supports pluggable schedulers.  ``FilterScheduler`` should work in most
+# cases.
+SCHEDULER=${SCHEDULER:-nova.scheduler.filter_scheduler.FilterScheduler}
 
 HOST_IP_IFACE=${HOST_IP_IFACE:-eth0}
 # Use the eth0 IP unless an explicit is set by ``HOST_IP`` environment variable
@@ -1192,7 +1192,7 @@ add_nova_opt "[DEFAULT]"
 add_nova_opt "verbose=True"
 add_nova_opt "auth_strategy=keystone"
 add_nova_opt "allow_resize_to_same_host=True"
-add_nova_opt "scheduler_driver=$SCHEDULER"
+add_nova_opt "compute_scheduler_driver=$SCHEDULER"
 add_nova_opt "dhcpbridge_flagfile=$NOVA_CONF_DIR/$NOVA_CONF"
 add_nova_opt "fixed_range=$FIXED_RANGE"
 if is_service_enabled n-obj; then