openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Add scheduler_driver parameter to nova::scheduler class"

This commit is contained in:
Jenkins 2015-07-08 16:26:16 +00:00 committed by Gerrit Code Review
parent 88cbb2bafa 36a24522c1
commit c1afc9ec65
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/scheduler.pp
View File

@ -16,10 +16,15 @@
# (optional) The state of the scheduler package
# Defaults to 'present'
#
# [*scheduler_driver*]
# (optional) Default driver to use for the scheduler
# Defaults to 'nova.scheduler.host_manager.HostManager'
#
class nova::scheduler(
$enabled = false,
$manage_service = true,
$ensure_package = 'present'
$enabled = false,
$manage_service = true,
$ensure_package = 'present',
$scheduler_driver = 'nova.scheduler.host_manager.HostManager',
) {
include ::nova::db
@ -33,4 +38,10 @@ class nova::scheduler(
ensure_package => $ensure_package,
}
nova_config {
'DEFAULT/scheduler_driver': value => $scheduler_driver;
}
Nova_config['DEFAULT/scheduler_driver'] ~> Service <| title == 'nova-scheduler' |>
}

10
spec/classes/nova_scheduler_spec.rb
View File

@ -24,6 +24,8 @@ describe 'nova::scheduler' do
:ensure => 'running'
)}
it { is_expected.to contain_nova_config('DEFAULT/scheduler_driver').with_value('nova.scheduler.host_manager.HostManager') }
context 'with manage_service as false' do
let :params do
{ :enabled => true,
@ -43,6 +45,14 @@ describe 'nova::scheduler' do
)}
end
context 'with scheduler driver' do
let :params do
{ :scheduler_driver => 'custom driver' }
end
it { is_expected.to contain_nova_config('DEFAULT/scheduler_driver').with_value('custom driver') }
end
context 'with default database parameters' do
let :pre_condition do
"include nova"