Merge "Remove deprecated parameters for baremetal scheduling"
This commit is contained in:
commit
c1d92c4c74
|
@ -92,21 +92,6 @@
|
||||||
# (optional) Separator character(s) for image property namespace and name
|
# (optional) Separator character(s) for image property namespace and name
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# DEPRECATED
|
|
||||||
#
|
|
||||||
# [*baremetal_scheduler_default_filters*]
|
|
||||||
# An array of filters to be used by default for baremetal hosts
|
|
||||||
# No longer used. Defaults to undef
|
|
||||||
#
|
|
||||||
# [*scheduler_use_baremetal_filters*]
|
|
||||||
# Use baremetal_scheduler_default_filters or not.
|
|
||||||
# No longer used. Defaults to undef
|
|
||||||
#
|
|
||||||
# [*scheduler_host_manager*]
|
|
||||||
# The scheduler host manager class to use.
|
|
||||||
# No longer used. Defaults to undef
|
|
||||||
#
|
|
||||||
|
|
||||||
class nova::scheduler::filter (
|
class nova::scheduler::filter (
|
||||||
$scheduler_max_attempts = '3',
|
$scheduler_max_attempts = '3',
|
||||||
$scheduler_host_subset_size = '1',
|
$scheduler_host_subset_size = '1',
|
||||||
|
@ -128,10 +113,6 @@ class nova::scheduler::filter (
|
||||||
$restrict_isolated_hosts_to_isolated_images = $::os_service_default,
|
$restrict_isolated_hosts_to_isolated_images = $::os_service_default,
|
||||||
$aggregate_image_properties_isolation_namespace = $::os_service_default,
|
$aggregate_image_properties_isolation_namespace = $::os_service_default,
|
||||||
$aggregate_image_properties_isolation_separator = $::os_service_default,
|
$aggregate_image_properties_isolation_separator = $::os_service_default,
|
||||||
# DEPRECATED
|
|
||||||
$baremetal_scheduler_default_filters = undef,
|
|
||||||
$scheduler_use_baremetal_filters = undef,
|
|
||||||
$scheduler_host_manager = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include nova::deps
|
include nova::deps
|
||||||
|
@ -158,12 +139,6 @@ class nova::scheduler::filter (
|
||||||
$scheduler_available_filters_real = any2array($scheduler_available_filters)
|
$scheduler_available_filters_real = any2array($scheduler_available_filters)
|
||||||
}
|
}
|
||||||
|
|
||||||
if $baremetal_scheduler_default_filters or $scheduler_use_baremetal_filters or $scheduler_host_manager {
|
|
||||||
warning('The scheduler_host_manager, baremetal_scheduler_default_filters and \
|
|
||||||
scheduler_use_baremetal_filters parameters are deprecated and will have \
|
|
||||||
no effect. Baremetal scheduling now uses custom resource classes.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if !is_service_default($isolated_images) and !empty($isolated_images){
|
if !is_service_default($isolated_images) and !empty($isolated_images){
|
||||||
validate_legacy(Array, 'validate_array', $isolated_images)
|
validate_legacy(Array, 'validate_array', $isolated_images)
|
||||||
$isolated_images_real = join($isolated_images, ',')
|
$isolated_images_real = join($isolated_images, ',')
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The following deprecated parameters have been removed.
|
||||||
|
|
||||||
|
- ``nova::scheduler::filter::baremetal_scheduler_default_filters``
|
||||||
|
- ``nova::scheduler::filter::scheduler_use_baremetal_filters``
|
||||||
|
- ``nova::scheduler::filter::scheduler_host_manager``
|
|
@ -52,18 +52,6 @@ describe 'nova::scheduler::filter' do
|
||||||
it { is_expected.to contain_nova_config('filter_scheduler/available_filters').with_value(['nova_filter1','nova_filter2']) }
|
it { is_expected.to contain_nova_config('filter_scheduler/available_filters').with_value(['nova_filter1','nova_filter2']) }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when overriding deprecated params' do
|
|
||||||
let :params do
|
|
||||||
{
|
|
||||||
:scheduler_use_baremetal_filters => true,
|
|
||||||
:baremetal_scheduler_default_filters => ['ExactRamFilter','ExactDiskFilter','ExactCoreFilter'],
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
it { is_expected.to_not contain_nova_config('filter_scheduler/use_baremetal_filters') }
|
|
||||||
it { is_expected.to_not contain_nova_config('filter_scheduler/baremetal_enabled_filters') }
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when overriding params with empty arrays' do
|
context 'when overriding params with empty arrays' do
|
||||||
let :params do
|
let :params do
|
||||||
{ :isolated_images => [],
|
{ :isolated_images => [],
|
||||||
|
|
Loading…
Reference in New Issue