Merge "Add support for filter_scheduler/cross_cell_move_weight_multiplier"
This commit is contained in:
commit
723a8b7587
|
@ -75,6 +75,10 @@
|
||||||
# failures
|
# failures
|
||||||
# Defaults to $::os_service_default
|
# 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*]
|
# [*shuffle_best_same_weighed_hosts*]
|
||||||
# (Optional) Enabled spreading the instances between hosts with the same
|
# (Optional) Enabled spreading the instances between hosts with the same
|
||||||
# best weight
|
# best weight
|
||||||
|
@ -121,6 +125,7 @@ class nova::scheduler::filter (
|
||||||
$soft_affinity_weight_multiplier = $::os_service_default,
|
$soft_affinity_weight_multiplier = $::os_service_default,
|
||||||
$soft_anti_affinity_weight_multiplier = $::os_service_default,
|
$soft_anti_affinity_weight_multiplier = $::os_service_default,
|
||||||
$build_failure_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,
|
$shuffle_best_same_weighed_hosts = $::os_service_default,
|
||||||
$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,
|
||||||
|
@ -210,6 +215,8 @@ will be removed in a future release. Use the nova::scheduler::periodic_task_inte
|
||||||
value => $soft_anti_affinity_weight_multiplier;
|
value => $soft_anti_affinity_weight_multiplier;
|
||||||
'filter_scheduler/build_failure_weight_multiplier':
|
'filter_scheduler/build_failure_weight_multiplier':
|
||||||
value => $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':
|
'filter_scheduler/shuffle_best_same_weighed_hosts':
|
||||||
value => $shuffle_best_same_weighed_hosts;
|
value => $shuffle_best_same_weighed_hosts;
|
||||||
'filter_scheduler/restrict_isolated_hosts_to_isolated_images':
|
'filter_scheduler/restrict_isolated_hosts_to_isolated_images':
|
||||||
|
|
|
@ -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.
|
|
@ -25,6 +25,7 @@ describe 'nova::scheduler::filter' do
|
||||||
it { is_expected.to contain_nova_config('filter_scheduler/soft_affinity_weight_multiplier').with_value('<SERVICE DEFAULT>') }
|
it { is_expected.to contain_nova_config('filter_scheduler/soft_affinity_weight_multiplier').with_value('<SERVICE DEFAULT>') }
|
||||||
it { is_expected.to contain_nova_config('filter_scheduler/soft_anti_affinity_weight_multiplier').with_value('<SERVICE DEFAULT>') }
|
it { is_expected.to contain_nova_config('filter_scheduler/soft_anti_affinity_weight_multiplier').with_value('<SERVICE DEFAULT>') }
|
||||||
it { is_expected.to contain_nova_config('filter_scheduler/build_failure_weight_multiplier').with_value('<SERVICE DEFAULT>') }
|
it { is_expected.to contain_nova_config('filter_scheduler/build_failure_weight_multiplier').with_value('<SERVICE DEFAULT>') }
|
||||||
|
it { is_expected.to contain_nova_config('filter_scheduler/cross_cell_move_weight_multiplier').with_value('<SERVICE DEFAULT>') }
|
||||||
it { is_expected.to contain_nova_config('filter_scheduler/shuffle_best_same_weighed_hosts').with_value('<SERVICE DEFAULT>') }
|
it { is_expected.to contain_nova_config('filter_scheduler/shuffle_best_same_weighed_hosts').with_value('<SERVICE DEFAULT>') }
|
||||||
it { is_expected.to contain_nova_config('filter_scheduler/restrict_isolated_hosts_to_isolated_images').with_value('<SERVICE DEFAULT>') }
|
it { is_expected.to contain_nova_config('filter_scheduler/restrict_isolated_hosts_to_isolated_images').with_value('<SERVICE DEFAULT>') }
|
||||||
it { is_expected.to contain_nova_config('filter_scheduler/aggregate_image_properties_isolation_namespace').with_value('<SERVICE DEFAULT>') }
|
it { is_expected.to contain_nova_config('filter_scheduler/aggregate_image_properties_isolation_namespace').with_value('<SERVICE DEFAULT>') }
|
||||||
|
@ -54,6 +55,7 @@ describe 'nova::scheduler::filter' do
|
||||||
:soft_affinity_weight_multiplier => 50,
|
:soft_affinity_weight_multiplier => 50,
|
||||||
:soft_anti_affinity_weight_multiplier => 60,
|
:soft_anti_affinity_weight_multiplier => 60,
|
||||||
:build_failure_weight_multiplier => 100,
|
:build_failure_weight_multiplier => 100,
|
||||||
|
:cross_cell_move_weight_multiplier => 1000,
|
||||||
:shuffle_best_same_weighed_hosts => true,
|
:shuffle_best_same_weighed_hosts => true,
|
||||||
}
|
}
|
||||||
end
|
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_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/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/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/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_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') }
|
it { is_expected.to contain_nova_config('filter_scheduler/isolated_hosts').with_value('192.168.1.2,192.168.1.3') }
|
||||||
|
|
Loading…
Reference in New Issue