openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Deprecate nova::scheduler::scheduler_driver"

This commit is contained in:
Zuul 2020-06-18 16:58:16 +00:00 committed by Gerrit Code Review
parent 24d852ec88 9bff55b175
commit cee9ddd97a
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/scheduler.pp
View File

@ -20,10 +20,6 @@
# (Optional) The amount of scheduler workers.
# Defaults to $::os_workers
#
# [*scheduler_driver*]
# (Optional) Default driver to use for the scheduler
# Defaults to 'filter_scheduler'
#
# [*discover_hosts_in_cells_interval*]
# (Optional) This value controls how often (in seconds) the scheduler should
# attempt to discover new hosts that have been added to cells.
@ -68,12 +64,17 @@
# aggregate.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*scheduler_driver*]
# (Optional) Default driver to use for the scheduler
# Defaults to undef
#
class nova::scheduler(
$enabled = true,
$manage_service = true,
$ensure_package = 'present',
$workers = $::os_workers,
$scheduler_driver = 'filter_scheduler',
$discover_hosts_in_cells_interval = $::os_service_default,
$query_placement_for_image_type_support = $::os_service_default,
$limit_tenants_to_placement_aggregate = $::os_service_default,
@ -81,6 +82,8 @@ class nova::scheduler(
$max_placement_results = $::os_service_default,
$enable_isolated_aggregate_filtering = $::os_service_default,
$query_placement_for_availability_zone = $::os_service_default,
# DEPRECATED PARAMETERS
$scheduler_driver = undef,
) {
include nova::deps
@ -98,7 +101,6 @@ class nova::scheduler(
nova_config {
'scheduler/workers': value => $workers;
'scheduler/driver': value => $scheduler_driver;
'scheduler/discover_hosts_in_cells_interval': value => $discover_hosts_in_cells_interval;
'scheduler/query_placement_for_image_type_support': value => $query_placement_for_image_type_support;
'scheduler/limit_tenants_to_placement_aggregate': value => $limit_tenants_to_placement_aggregate;
@ -107,4 +109,16 @@ class nova::scheduler(
'scheduler/enable_isolated_aggregate_filtering': value => $enable_isolated_aggregate_filtering;
'scheduler/query_placement_for_availability_zone': value => $query_placement_for_availability_zone;
}
if $scheduler_driver != undef {
warning('The scheduler_driver parameter is deprecated and will be removed \
in a future release')
nova_config {
'scheduler/driver': value => $scheduler_driver;
}
} else {
nova_config {
'scheduler/driver': ensure => absent;
}
}
}

5
releasenotes/notes/deprecate-scheduler_driver-8f2c60797709ad9a.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``nova::scheduler::scheduler_driver`` parameter has been deprecated and
will be removed in a future release.

2
spec/classes/nova_scheduler_spec.rb
View File

@ -18,7 +18,7 @@ describe 'nova::scheduler' do
)}
it { is_expected.to contain_nova_config('scheduler/workers').with_value(4) }
it { is_expected.to contain_nova_config('scheduler/driver').with_value('filter_scheduler') }
it { is_expected.to contain_nova_config('scheduler/driver').with_ensure('absent') }
it { is_expected.to contain_nova_config('scheduler/discover_hosts_in_cells_interval').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('scheduler/query_placement_for_image_type_support').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('scheduler/limit_tenants_to_placement_aggregate').with_value('<SERVICE DEFAULT>') }