Change scheduler configurations to use entrypoints

Full class path style configuration of options scheduler_host_manager and scheduler_driver are deprecated because of dependent changes. This commit changes the related configurations to use entrypoints in setting up nova scheduler in devstack. Related to blueprint scheduler-driver-use-stevedore Depends-On: I8c169e12d9bfacdbdb1dadf68b8a1fa98c5ea5bc Depends-On: I3fd42ead44487a21eb5cfaf5a91209277ce30ad0 Change-Id: Iad96c270073b63719237cf9a9aa1c2dc4daa213a
openstack · Jan 29, 2016 · b298e57 · b298e57
1 parent 3c92590
commit b298e57
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/nova b/lib/nova
@@ -96,7 +96,7 @@ FORCE_CONFIG_DRIVE=${FORCE_CONFIG_DRIVE:-"True"}
 
 # Nova supports pluggable schedulers.  The default ``FilterScheduler``
 # should work in most cases.
-SCHEDULER=${SCHEDULER:-nova.scheduler.filter_scheduler.FilterScheduler}
+SCHEDULER=${SCHEDULER:-filter_scheduler}
 
 # The following FILTERS contains SameHostFilter and DifferentHostFilter with
 # the default filters.

diff --git a/lib/nova_plugins/hypervisor-ironic b/lib/nova_plugins/hypervisor-ironic
@@ -41,7 +41,7 @@ function configure_nova_hypervisor {
 
     iniset $NOVA_CONF DEFAULT compute_driver nova.virt.ironic.IronicDriver
     iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER
-    iniset $NOVA_CONF DEFAULT scheduler_host_manager nova.scheduler.ironic_host_manager.IronicHostManager
+    iniset $NOVA_CONF DEFAULT scheduler_host_manager ironic_host_manager
     iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0
     iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0
     # ironic section