From ce5952ffd4e4bd2a61574697b5b6b96deef31710 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Mon, 28 Mar 2016 17:09:11 -0500 Subject: [PATCH] remove depricated manager options and replace class paths As detailed here, we remove depricated options and use entrypoints instead of the full class path. http://docs.openstack.org/releasenotes/nova/mitaka.html Change-Id: Ib5d969d15255163299d1d69633a9ee84f22e732f --- defaults/main.yml | 5 ++--- templates/nova.conf.j2 | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 6129dc36..d85cf4de 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -240,10 +240,9 @@ nova_scheduler_driver_task_period: 60 nova_scheduler_host_subset_size: 10 nova_scheduler_max_attempts: 5 nova_scheduler_default_filters: "RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,AggregateCoreFilter,AggregateDiskFilter" -nova_scheduler_driver: nova.scheduler.filter_scheduler.FilterScheduler +nova_scheduler_driver: filter_scheduler nova_scheduler_available_filters: nova.scheduler.filters.all_filters -nova_scheduler_host_manager: nova.scheduler.host_manager.HostManager -nova_scheduler_manager: nova.scheduler.manager.SchedulerManager +nova_scheduler_host_manager: host_manager nova_scheduler_weight_classes: nova.scheduler.weights.all_weighers nova_scheduler_program_name: nova-scheduler diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index cdadb1e0..9d6c862c 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -50,7 +50,6 @@ scheduler_default_filters = {{ nova_scheduler_default_filters }} scheduler_driver_task_period = {{ nova_scheduler_driver_task_period }} scheduler_host_manager = {{ nova_scheduler_host_manager }} scheduler_host_subset_size = {{ nova_scheduler_host_subset_size }} -scheduler_manager = {{ nova_scheduler_manager }} scheduler_max_attempts = {{ nova_scheduler_max_attempts }} scheduler_weight_classes = {{ nova_scheduler_weight_classes }}