openstack
/
puppet-cinder
Code Issues Proposed changes

Merge "Decouple $sync_db from $enabled"

This commit is contained in:
Jenkins 2015-05-13 15:36:23 +00:00 committed by Gerrit Code Review
parent d6ccce6554 ffdd9836bd
commit 83c2fbb14c
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
manifests/api.pp
View File

@ -172,20 +172,21 @@ class cinder::api (
}
}
if $enabled {
if $sync_db {
Cinder_config<||> ~> Exec['cinder-manage db_sync']
if $sync_db {
Cinder_config<||> ~> Exec['cinder-manage db_sync']
exec { 'cinder-manage db_sync':
command => $::cinder::params::db_sync_command,
path => '/usr/bin',
user => 'cinder',
refreshonly => true,
logoutput => 'on_failure',
subscribe => Package['cinder'],
before => Service['cinder-api'],
}
exec { 'cinder-manage db_sync':
command => $::cinder::params::db_sync_command,
path => '/usr/bin',
user => 'cinder',
refreshonly => true,
logoutput => 'on_failure',
subscribe => Package['cinder'],
before => Service['cinder-api'],
}
}
if $enabled {
if $manage_service {
$ensure = 'running'
}

5
spec/classes/cinder_api_spec.rb
View File

@ -183,7 +183,7 @@ describe 'cinder::api' do
is_expected.to contain_service('cinder-api').with_ensure('stopped')
end
it 'should contain db_sync exec' do
is_expected.to_not contain_exec('cinder-manage db_sync')
is_expected.to contain_exec('cinder-manage db_sync')
end
end
@ -194,6 +194,9 @@ describe 'cinder::api' do
it 'should not change the state of the service' do
is_expected.to contain_service('cinder-api').without_ensure
end
it 'should contain db_sync exec' do
is_expected.to contain_exec('cinder-manage db_sync')
end
end
describe 'with ratelimits' do