scheduler_default_filters for cloud::compute::scheduler

* allow user to use scheduler_default_filters to specify scheduler
* filters in nova.conf
This commit is contained in:
Nicolas Hicher 2014-08-11 15:23:50 -04:00
parent 98f4df67d1
commit a89621b839
2 changed files with 24 additions and 2 deletions

View File

@ -15,8 +15,13 @@
# #
# Compute Scheduler node # Compute Scheduler node
# #
# [*scheduler_default_filters*]
class cloud::compute::scheduler { # (optional) A comma separated list of filters to be used by default
# Defaults to false
#
class cloud::compute::scheduler(
$scheduler_default_filters = false
){
include 'cloud::compute' include 'cloud::compute'
@ -24,4 +29,8 @@ class cloud::compute::scheduler {
enabled => true, enabled => true,
} }
class { 'nova::scheduler::filter':
scheduler_default_filters => $scheduler_default_filters,
}
} }

View File

@ -43,6 +43,10 @@ describe 'cloud::compute::scheduler' do
log_facility => 'LOG_LOCAL0' }" log_facility => 'LOG_LOCAL0' }"
end end
let :params do
{ :scheduler_default_filters => ['RamFilter', 'ComputeFilter'] }
end
it 'configure nova common' do it 'configure nova common' do
should contain_class('nova').with( should contain_class('nova').with(
:verbose => true, :verbose => true,
@ -86,6 +90,15 @@ describe 'cloud::compute::scheduler' do
should contain_class('nova::scheduler').with(:enabled => true) should contain_class('nova::scheduler').with(:enabled => true)
end end
it 'configure nova-scheduler filters' do
should contain_class('nova::scheduler::filter').with(
:scheduler_default_filters => ['RamFilter', 'ComputeFilter']
)
should contain_nova_config('DEFAULT/scheduler_default_filters').with(
'value' => "RamFilter,ComputeFilter"
)
end
end end
context 'on Debian platforms' do context 'on Debian platforms' do