From d8d9e6747b977c913a3d40d922d957767f4ad6af Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 2 Oct 2020 15:50:57 +0900 Subject: [PATCH] Add support for filter_scheduler/cross_cell_move_weight_multiplier Change-Id: I145e9d9e5d937fa6718a640a3b59864112a9463d --- manifests/scheduler/filter.pp | 7 +++++++ ...cross_cell_move_weight_multiplier-280eead3d1455f18.yaml | 6 ++++++ spec/classes/nova_scheduler_filter_spec.rb | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 releasenotes/notes/scheduler-filter-cross_cell_move_weight_multiplier-280eead3d1455f18.yaml diff --git a/manifests/scheduler/filter.pp b/manifests/scheduler/filter.pp index edbeb07e4..c957ab6be 100644 --- a/manifests/scheduler/filter.pp +++ b/manifests/scheduler/filter.pp @@ -75,6 +75,10 @@ # failures # Defaults to $::os_service_default # +# [*cross_cell_move_weight_multiplier*] +# (optional) Multiplier used for weighing hosts during a cross-cell move +# Defaults to $::os_service_default +# # [*shuffle_best_same_weighed_hosts*] # (Optional) Enabled spreading the instances between hosts with the same # best weight @@ -121,6 +125,7 @@ class nova::scheduler::filter ( $soft_affinity_weight_multiplier = $::os_service_default, $soft_anti_affinity_weight_multiplier = $::os_service_default, $build_failure_weight_multiplier = $::os_service_default, + $cross_cell_move_weight_multiplier = $::os_service_default, $shuffle_best_same_weighed_hosts = $::os_service_default, $restrict_isolated_hosts_to_isolated_images = $::os_service_default, $aggregate_image_properties_isolation_namespace = $::os_service_default, @@ -210,6 +215,8 @@ will be removed in a future release. Use the nova::scheduler::periodic_task_inte value => $soft_anti_affinity_weight_multiplier; 'filter_scheduler/build_failure_weight_multiplier': value => $build_failure_weight_multiplier; + 'filter_scheduler/cross_cell_move_weight_multiplier': + value => $cross_cell_move_weight_multiplier; 'filter_scheduler/shuffle_best_same_weighed_hosts': value => $shuffle_best_same_weighed_hosts; 'filter_scheduler/restrict_isolated_hosts_to_isolated_images': diff --git a/releasenotes/notes/scheduler-filter-cross_cell_move_weight_multiplier-280eead3d1455f18.yaml b/releasenotes/notes/scheduler-filter-cross_cell_move_weight_multiplier-280eead3d1455f18.yaml new file mode 100644 index 000000000..edc4e7cf6 --- /dev/null +++ b/releasenotes/notes/scheduler-filter-cross_cell_move_weight_multiplier-280eead3d1455f18.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + The new ``nova::scheduler::filter::cross_cell_move_weight_multiplier`` + parameter has been added, to manage the corresponding parameter in + nova-scheduler. diff --git a/spec/classes/nova_scheduler_filter_spec.rb b/spec/classes/nova_scheduler_filter_spec.rb index df36aa3d2..f36dcd24e 100644 --- a/spec/classes/nova_scheduler_filter_spec.rb +++ b/spec/classes/nova_scheduler_filter_spec.rb @@ -25,6 +25,7 @@ describe 'nova::scheduler::filter' do it { is_expected.to contain_nova_config('filter_scheduler/soft_affinity_weight_multiplier').with_value('') } it { is_expected.to contain_nova_config('filter_scheduler/soft_anti_affinity_weight_multiplier').with_value('') } it { is_expected.to contain_nova_config('filter_scheduler/build_failure_weight_multiplier').with_value('') } + it { is_expected.to contain_nova_config('filter_scheduler/cross_cell_move_weight_multiplier').with_value('') } it { is_expected.to contain_nova_config('filter_scheduler/shuffle_best_same_weighed_hosts').with_value('') } it { is_expected.to contain_nova_config('filter_scheduler/restrict_isolated_hosts_to_isolated_images').with_value('') } it { is_expected.to contain_nova_config('filter_scheduler/aggregate_image_properties_isolation_namespace').with_value('') } @@ -54,6 +55,7 @@ describe 'nova::scheduler::filter' do :soft_affinity_weight_multiplier => 50, :soft_anti_affinity_weight_multiplier => 60, :build_failure_weight_multiplier => 100, + :cross_cell_move_weight_multiplier => 1000, :shuffle_best_same_weighed_hosts => true, } end @@ -69,6 +71,7 @@ describe 'nova::scheduler::filter' do it { is_expected.to contain_nova_config('filter_scheduler/soft_affinity_weight_multiplier').with_value(50) } it { is_expected.to contain_nova_config('filter_scheduler/soft_anti_affinity_weight_multiplier').with_value(60) } it { is_expected.to contain_nova_config('filter_scheduler/build_failure_weight_multiplier').with_value(100) } + it { is_expected.to contain_nova_config('filter_scheduler/cross_cell_move_weight_multiplier').with_value(1000) } it { is_expected.to contain_nova_config('filter_scheduler/shuffle_best_same_weighed_hosts').with_value(true) } it { is_expected.to contain_nova_config('filter_scheduler/isolated_images').with_value('ubuntu1,centos2') } it { is_expected.to contain_nova_config('filter_scheduler/isolated_hosts').with_value('192.168.1.2,192.168.1.3') }