openstack
/
puppet-nova
Code Issues Proposed changes

Remove deprecated scheduler and scheduler filter options 

This is a code clean and has no user impact.

Change-Id: I76dcf7772b25d18a8686dcd8a0279d999725cb39
This commit is contained in:
Yaguang Tang 2017-07-09 11:32:30 +08:00
parent c47cf92e6a
commit ab51c308e2
4 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/scheduler.pp
View File

@ -50,8 +50,4 @@ class nova::scheduler(
'scheduler/discover_hosts_in_cells_interval': value => $discover_hosts_in_cells_interval;
}
# TODO(aschultz): old options, remove in P
nova_config {
'DEFAULT/scheduler_driver': ensure => 'absent';
}
}

16
manifests/scheduler/filter.pp
View File

@ -215,20 +215,4 @@ class nova::scheduler::filter (
value => $aggregate_image_properties_isolation_separator;
}
# TODO(aschultz): old options, remove in P
nova_config {
'DEFAULT/scheduler_host_manager': ensure => 'absent';
'DEFAULT/scheduler_max_attempts': ensure => 'absent';
'DEFAULT/scheduler_host_subset_size': ensure => 'absent';
'DEFAULT/max_io_ops_per_host': ensure => 'absent';
'DEFAULT/max_instances_per_host': ensure => 'absent';
'DEFAULT/scheduler_available_filters': ensure => 'absent';
'DEFAULT/scheduler_weight_classes': ensure => 'absent';
'DEFAULT/scheduler_use_baremetal_filters': ensure => 'absent';
'DEFAULT/scheduler_default_filters': ensure => 'absent';
'DEFAULT/baremetal_scheduler_default_filters': ensure => 'absent';
'DEFAULT/isolated_images': ensure => 'absent';
'DEFAULT/isolated_hosts': ensure => 'absent';
}
}

12
spec/classes/nova_scheduler_filter_spec.rb
View File

@ -32,18 +32,6 @@ describe 'nova::scheduler::filter' do
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_separator').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/scheduler_host_manager').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/scheduler_max_attempts').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/scheduler_host_subset_size').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/max_io_ops_per_host').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/max_instances_per_host').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/scheduler_available_filters').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/scheduler_weight_classes').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/scheduler_use_baremetal_filters').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/isolated_images').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/isolated_hosts').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/scheduler_default_filters').with_ensure('absent') }
it { is_expected.to contain_nova_config('DEFAULT/baremetal_scheduler_default_filters').with_ensure('absent') }
end
context 'when overriding params with non-empty arrays' do

1
spec/classes/nova_scheduler_spec.rb
View File

@ -20,7 +20,6 @@ describe 'nova::scheduler' do
:ensure => 'running'
)}
it { is_expected.to contain_nova_config('DEFAULT/scheduler_driver').with_ensure('absent') }
it { is_expected.to contain_nova_config('scheduler/driver').with_value('filter_scheduler') }
it { is_expected.to contain_nova_config('scheduler/discover_hosts_in_cells_interval').with_value('<SERVICE DEFAULT>') }