Add manage_service feature

puppet-heat lacks of disabling service managing. This patch adds
$manage_service parameter to all relevant classes.

Closes-bug: #1359823
Change-Id: I54245b39f3484ccdb9910aa0fa4c8dc2bae3f0ce
This commit is contained in:
Martin Magr
2014-08-20 18:03:45 +02:00
committed by Martin Mágr
parent 0d857a063b
commit 2ee54962a8
8 changed files with 408 additions and 150 deletions

View File

@@ -4,6 +4,7 @@ describe 'heat::engine' do
let :default_params do
{ :enabled => true,
:manage_service => true,
:heat_stack_user_role => 'heat_stack_user',
:heat_metadata_server_url => 'http://127.0.0.1:8000',
:heat_waitcondition_server_url => 'http://127.0.0.1:8000/v1/waitcondition',
@@ -38,7 +39,7 @@ describe 'heat::engine' do
it { should contain_package('heat-engine').with_name(os_params[:package_name]) }
it { should contain_service('heat-engine').with(
:ensure => expected_params[:enabled] ? 'running' : 'stopped',
:ensure => (expected_params[:manage_service] && expected_params[:enabled]) ? 'running' : 'stopped',
:name => os_params[:service_name],
:enable => expected_params[:enabled],
:hasstatus => 'true',
@@ -56,6 +57,26 @@ describe 'heat::engine' do
it { should contain_heat_config('DEFAULT/heat_watch_server_url').with_value( expected_params[:heat_watch_server_url] ) }
it { should contain_heat_config('DEFAULT/engine_life_check_timeout').with_value( expected_params[:engine_life_check_timeout] ) }
end
context 'with disabled service managing' do
before do
params.merge!({
:manage_service => false,
:enabled => false })
end
it { should contain_service('heat-engine').with(
:ensure => nil,
:name => os_params[:service_name],
:enable => false,
:hasstatus => 'true',
:hasrestart => 'true',
:require => [ 'File[/etc/heat/heat.conf]',
'Package[heat-common]',
'Package[heat-engine]'],
:subscribe => 'Exec[heat-dbsync]'
) }
end
end
context 'on Debian platforms' do