openstack/puppet-nova
Code Issues Proposed changes

Deprecate parameters with scheduler_ prefix in nova::scheduler::filter

Browse Source 
Add new parameters that doesn't have the scheduler_ prefix and
deprecate the ones that has it.

Change-Id: Idf97c5617e24ac1ce20e08bf6161a7a26f39abe7
This commit is contained in:
Tobias Urdin
2023-09-15 14:05:41 +00:00
parent afd917e0f9
commit 0cf7b86bc9
3 changed files with 65 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
manifests/scheduler/filter.pp
View File

@@ -4,7 +4,7 @@
# #
# === Parameters: # === Parameters:
# #
# [*scheduler_host_subset_size*] # [*host_subset_size*]
# (optional) defines the subset size that a host is chosen from # (optional) defines the subset size that a host is chosen from
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
@@ -24,16 +24,16 @@
# (optional) An array of hosts reserved for specific images # (optional) An array of hosts reserved for specific images
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*scheduler_available_filters*] # [*available_filters*]
# (optional) An array with filter classes available to the scheduler. # (optional) An array with filter classes available to the scheduler.
# Example: ['first.filter.class', 'second.filter.class'] # Example: ['first.filter.class', 'second.filter.class']
# Defaults to ['nova.scheduler.filters.all_filters'] # Defaults to ['nova.scheduler.filters.all_filters']
# #
# [*scheduler_enabled_filters*] # [*enabled_filters*]
# (optional) An array of filters to be used by default # (optional) An array of filters to be used by default
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*scheduler_weight_classes*] # [*weight_classes*]
# (optional) Which weight class names to use for weighing hosts # (optional) Which weight class names to use for weighing hosts
# Defaults to 'nova.scheduler.weights.all_weighers' # Defaults to 'nova.scheduler.weights.all_weighers'
# #
@@ -104,15 +104,34 @@
# (optional) Separator character(s) for image property namespace and name # (optional) Separator character(s) for image property namespace and name
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# == DEPRECATED PARAMETERS ==
#
# [*scheduler_host_subset_size*]
# (optional) defines the subset size that a host is chosen from
# Defaults to undef
#
# [*scheduler_available_filters*]
# (optional) An array with filter classes available to the scheduler.
# Example: ['first.filter.class', 'second.filter.class']
# Defaults to undef
#
# [*scheduler_enabled_filters*]
# (optional) An array of filters to be used by default
# Defaults to undef
#
# [*scheduler_weight_classes*]
# (optional) Which weight class names to use for weighing hosts
# Defaults to undef
#
class nova::scheduler::filter ( class nova::scheduler::filter (
$scheduler_host_subset_size = $facts['os_service_default'], $host_subset_size = $facts['os_service_default'],
$max_io_ops_per_host = $facts['os_service_default'], $max_io_ops_per_host = $facts['os_service_default'],
$max_instances_per_host = $facts['os_service_default'], $max_instances_per_host = $facts['os_service_default'],
$isolated_images = $facts['os_service_default'], $isolated_images = $facts['os_service_default'],
$isolated_hosts = $facts['os_service_default'], $isolated_hosts = $facts['os_service_default'],
Array[String[1]] $scheduler_available_filters = ['nova.scheduler.filters.all_filters'], Array[String[1]] $available_filters = ['nova.scheduler.filters.all_filters'],
$scheduler_enabled_filters = $facts['os_service_default'], $enabled_filters = $facts['os_service_default'],
$scheduler_weight_classes = 'nova.scheduler.weights.all_weighers', $weight_classes = 'nova.scheduler.weights.all_weighers',
$track_instance_changes = $facts['os_service_default'], $track_instance_changes = $facts['os_service_default'],
$ram_weight_multiplier = $facts['os_service_default'], $ram_weight_multiplier = $facts['os_service_default'],
$cpu_weight_multiplier = $facts['os_service_default'], $cpu_weight_multiplier = $facts['os_service_default'],
@@ -128,27 +147,39 @@ class nova::scheduler::filter (
$restrict_isolated_hosts_to_isolated_images = $facts['os_service_default'], $restrict_isolated_hosts_to_isolated_images = $facts['os_service_default'],
$aggregate_image_properties_isolation_namespace = $facts['os_service_default'], $aggregate_image_properties_isolation_namespace = $facts['os_service_default'],
$aggregate_image_properties_isolation_separator = $facts['os_service_default'], $aggregate_image_properties_isolation_separator = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$scheduler_host_subset_size = undef,
$scheduler_available_filters = undef,
$scheduler_enabled_filters = undef,
$scheduler_weight_classes = undef,
) { ) {
include nova::deps include nova::deps
if is_service_default($scheduler_enabled_filters) { $host_subset_size_real = pick($scheduler_host_subset_size, $host_subset_size)
$scheduler_enabled_filters_real = $facts['os_service_default'] $weight_classes_real = pick($scheduler_weight_classes, $weight_classes)
} elsif empty($scheduler_enabled_filters){
$scheduler_enabled_filters_real = $facts['os_service_default'] $enabled_filters_pick = pick($scheduler_enabled_filters, $enabled_filters)
if is_service_default($enabled_filters_pick) {
$enabled_filters_real = $facts['os_service_default']
} elsif empty($enabled_filters_pick){
$enabled_filters_real = $facts['os_service_default']
} else { } else {
$scheduler_enabled_filters_real = join(any2array($scheduler_enabled_filters), ',') $enabled_filters_real = join(any2array($enabled_filters_pick), ',')
} }
if empty($scheduler_available_filters) { $available_filters_pick = pick($scheduler_available_filters, $available_filters)
$scheduler_available_filters_real = $facts['os_service_default']
if empty($available_filters_pick) {
$available_filters_real = $facts['os_service_default']
} else { } else {
$scheduler_available_filters_real = $scheduler_available_filters $available_filters_real = $available_filters_pick
} }
nova_config { nova_config {
'filter_scheduler/host_subset_size': 'filter_scheduler/host_subset_size':
value => $scheduler_host_subset_size; value => $host_subset_size_real;
'filter_scheduler/max_io_ops_per_host': 'filter_scheduler/max_io_ops_per_host':
value => $max_io_ops_per_host; value => $max_io_ops_per_host;
'filter_scheduler/max_instances_per_host': 'filter_scheduler/max_instances_per_host':
@@ -156,11 +187,11 @@ class nova::scheduler::filter (
'filter_scheduler/track_instance_changes': 'filter_scheduler/track_instance_changes':
value => $track_instance_changes; value => $track_instance_changes;
'filter_scheduler/available_filters': 'filter_scheduler/available_filters':
value => $scheduler_available_filters_real; value => $available_filters_real;
'filter_scheduler/weight_classes': 'filter_scheduler/weight_classes':
value => $scheduler_weight_classes; value => $weight_classes_real;
'filter_scheduler/enabled_filters': 'filter_scheduler/enabled_filters':
value => $scheduler_enabled_filters_real; value => $enabled_filters_real;
'filter_scheduler/isolated_images': 'filter_scheduler/isolated_images':
value => join(any2array($isolated_images), ','); value => join(any2array($isolated_images), ',');
'filter_scheduler/isolated_hosts': 'filter_scheduler/isolated_hosts':

8
releasenotes/notes/nova-scheduler-filter-prefix-b3753153ab9e0f87.yaml Normal file
View File

@@ -0,0 +1,8 @@
---
deprecations:
- |
The ``scheduler_host_subset_size``, ``scheduler_available_filters``,
``scheduler_enabled_filters`` and ``scheduler_weight_classes`` in the
nova::scheduler::filter class is deprecated in favor of the same parameters
without the ``scheduler_`` prefix, that is ``host_subset_size``,
``available_filters``, ``enabled_filters`` and ``weight_classes``.

12
spec/classes/nova_scheduler_filter_spec.rb
View File

@@ -41,14 +41,14 @@ describe 'nova::scheduler::filter' do
context 'when overriding params' do context 'when overriding params' do
let :params do let :params do
{ {
:scheduler_host_subset_size => '3', :host_subset_size => '3',
:max_io_ops_per_host => '16', :max_io_ops_per_host => '16',
:max_instances_per_host => '100', :max_instances_per_host => '100',
:isolated_images => ['ubuntu1','centos2'], :isolated_images => ['ubuntu1','centos2'],
:isolated_hosts => ['192.168.1.2','192.168.1.3'], :isolated_hosts => ['192.168.1.2','192.168.1.3'],
:scheduler_enabled_filters => ['RetryFilter','AvailabilityZoneFilter'], :enabled_filters => ['RetryFilter','AvailabilityZoneFilter'],
:scheduler_available_filters => ['nova_filter1','nova_filter2'], :available_filters => ['nova_filter1','nova_filter2'],
:scheduler_weight_classes => 'nova.scheduler.weights.compute.BuildFailureWeigher', :weight_classes => 'nova.scheduler.weights.compute.BuildFailureWeigher',
:track_instance_changes => true, :track_instance_changes => true,
:ram_weight_multiplier => 10, :ram_weight_multiplier => 10,
:cpu_weight_multiplier => 20, :cpu_weight_multiplier => 20,
@@ -88,8 +88,8 @@ describe 'nova::scheduler::filter' do
context 'when overriding params with empty arrays' do context 'when overriding params with empty arrays' do
let :params do let :params do
{ {
:scheduler_available_filters => [], :available_filters => [],
:scheduler_enabled_filters => [], :enabled_filters => [],
} }
end end