openstack/puppet-nova
Code Issues Proposed changes

scheduler: Simplify handling of isolated_images/hosts

Browse Source 
... following the existing implementations to manage list options.
These options default to empty arrays so even in case a user gives
empty values the actual configurations are not changed.

Change-Id: Ic5fb44a9d14359fc21c9e8d1cbb3b1413107e5da
This commit is contained in:
Takashi Kajinami 2023-06-21 14:12:38 +09:00
parent be36118fce
commit bcadab2490
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/scheduler/filter.pp
View File

@ -145,19 +145,6 @@ class nova::scheduler::filter (
$scheduler_available_filters_real = any2array($scheduler_available_filters)
}
if !is_service_default($isolated_images) and !empty($isolated_images){
validate_legacy(Array, 'validate_array', $isolated_images)
$isolated_images_real = join($isolated_images, ',')
} else {
$isolated_images_real = $facts['os_service_default']
}
if !is_service_default($isolated_hosts) and !empty($isolated_hosts){
validate_legacy(Array, 'validate_array', $isolated_hosts)
$isolated_hosts_real = join($isolated_hosts, ',')
} else {
$isolated_hosts_real = $facts['os_service_default']
}
nova_config {
'filter_scheduler/host_subset_size':
value => $scheduler_host_subset_size;
@ -174,9 +161,9 @@ class nova::scheduler::filter (
'filter_scheduler/enabled_filters':
value => $scheduler_enabled_filters_real;
'filter_scheduler/isolated_images':
value => $isolated_images_real;
value => join(any2array($isolated_images), ',');
'filter_scheduler/isolated_hosts':
value => $isolated_hosts_real;
value => join(any2array($isolated_hosts), ',');
'filter_scheduler/ram_weight_multiplier':
value => $ram_weight_multiplier;
'filter_scheduler/cpu_weight_multiplier':

9
spec/classes/nova_scheduler_filter_spec.rb
View File

@ -81,15 +81,12 @@ describe 'nova::scheduler::filter' do
context 'when overriding params with empty arrays' do
let :params do
{ :isolated_images => [],
:isolated_hosts => [],
:scheduler_available_filters => [],
:scheduler_enabled_filters => [],
{
:scheduler_available_filters => [],
:scheduler_enabled_filters => [],
}
end
it { is_expected.to contain_nova_config('filter_scheduler/isolated_images').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('filter_scheduler/isolated_hosts').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('filter_scheduler/available_filters').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('filter_scheduler/enabled_filters').with_value('<SERVICE DEFAULT>') }
end