openstack/puppet-cinder
Code Issues Proposed changes

Make scheduler_driver option can be clean up

Browse Source 
Current, scheduler_driver option can't be cleaned up even we set it
to false. This patch just add ELSE logic to fix it.

Closes-Bug: #1435660
Change-Id: I7d4634f2e99a025cfde317fc2eb1240a81824803
This commit is contained in:
Xingchao Yu
2015-03-24 12:24:30 +08:00
parent 9b0ff06b6a
commit 54d77c27ae
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/scheduler.pp
View File

@@ -38,6 +38,10 @@ class cinder::scheduler (
cinder_config { cinder_config {
'DEFAULT/scheduler_driver': value => $scheduler_driver; 'DEFAULT/scheduler_driver': value => $scheduler_driver;
} }
} else {
cinder_config {
'DEFAULT/scheduler_driver': ensure => absent;
}
} }
if $::cinder::params::scheduler_package { if $::cinder::params::scheduler_package {

3
spec/classes/cinder_scheduler_spec.rb
View File

@@ -11,11 +11,12 @@ describe 'cinder::scheduler' do
describe 'with default parameters' do describe 'with default parameters' do
it { is_expected.to contain_class('cinder::params') } it { is_expected.to contain_class('cinder::params') }
it { is_expected.to contain_cinder_config('DEFAULT/scheduler_driver').with_ensure('absent') }
it { is_expected.to contain_package('cinder-scheduler').with( it { is_expected.to contain_package('cinder-scheduler').with(
:name => 'cinder-scheduler', :name => 'cinder-scheduler',
:ensure => 'present', :ensure => 'present',
:before => 'Service[cinder-scheduler]' :before => ['Cinder_config[DEFAULT/scheduler_driver]','Service[cinder-scheduler]'],
) } ) }
it { is_expected.to contain_service('cinder-scheduler').with( it { is_expected.to contain_service('cinder-scheduler').with(