openstack
/
puppet-nova
Code Issues Proposed changes

Set hasstatus => true for nova services 

Fix bug 1170671

notifies to nova services on RHEL were not causing a restart of the service

Change-Id: I5fc91e1c519425e96677796d9de5222ab9d7f105
This commit is contained in:
Derek Higgins 2013-04-19 07:49:34 -04:00
parent c70691ec1d
commit f7830b7684
9 changed files with 91 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/generic_service.pp
View File

@ -46,10 +46,11 @@ define nova::generic_service(
if ($service_name) {
service { $nova_title:
name => $service_name,
ensure => $service_ensure,
enable => $enabled,
require => [Package['nova-common'], Package[$nova_title]],
name => $service_name,
ensure => $service_ensure,
enable => $enabled,
hasstatus => true,
require => [Package['nova-common'], Package[$nova_title]],
}
}

14
spec/classes/nova_api_spec.rb
View File

@ -15,9 +15,10 @@ describe 'nova::api' do
{ :osfamily => 'Debian' }
end
it { should contain_service('nova-api').with(
'name' => 'nova-api',
'ensure' => 'stopped',
'enable' => false
'name' => 'nova-api',
'ensure' => 'stopped',
'hasstatus' => 'true',
'enable' => false
)}
it { should contain_package('nova-api').with(
'name' => 'nova-api',
@ -29,9 +30,10 @@ describe 'nova::api' do
{:admin_password => 'passw0rd', :enabled => true}
end
it { should contain_service('nova-api').with(
'name' => 'nova-api',
'ensure' => 'running',
'enable' => true
'name' => 'nova-api',
'ensure' => 'running',
'hasstatus' => 'true',
'enable' => true
)}
end
describe 'with package version' do

21
spec/classes/nova_cert_spec.rb
View File

@ -11,9 +11,10 @@ describe 'nova::cert' do
{ :osfamily => 'Debian' }
end
it { should contain_service('nova-cert').with(
'name' => 'nova-cert',
'ensure' => 'stopped',
'enable' => false
'name' => 'nova-cert',
'ensure' => 'stopped',
'hasstatus' => 'true',
'enable' => false
)}
it { should contain_package('nova-cert').with(
'name' => 'nova-cert',
@ -25,9 +26,10 @@ describe 'nova::cert' do
{:enabled => true}
end
it { should contain_service('nova-cert').with(
'name' => 'nova-cert',
'ensure' => 'running',
'enable' => true
'name' => 'nova-cert',
'ensure' => 'running',
'hasstatus' => 'true',
'enable' => true
)}
end
describe 'with package version' do
@ -44,9 +46,10 @@ describe 'nova::cert' do
{ :osfamily => 'RedHat' }
end
it { should contain_service('nova-cert').with(
'name' => 'openstack-nova-cert',
'ensure' => 'stopped',
'enable' => false
'name' => 'openstack-nova-cert',
'ensure' => 'stopped',
'hasstatus' => 'true',
'enable' => false
)}
it { should contain_package('nova-cert').with_name('openstack-nova-cert') }
end

21
spec/classes/nova_compute_spec.rb
View File

@ -26,9 +26,10 @@ describe 'nova::compute' do
) }
it { should contain_service('nova-compute').with(
'name' => 'nova-compute',
'ensure' => 'stopped',
'enable' => false
'name' => 'nova-compute',
'ensure' => 'stopped',
'hasstatus' => 'true',
'enable' => false
)}
it { should contain_package('nova-compute').with(
'name' => 'nova-compute',
@ -48,9 +49,10 @@ describe 'nova::compute' do
}
end
it { should contain_service('nova-compute').with(
'name' => 'nova-compute',
'ensure' => 'running',
'enable' => true
'name' => 'nova-compute',
'ensure' => 'running',
'hasstatus' => 'true',
'enable' => true
)}
end
describe 'with vnc_enabled set to false' do
@ -78,9 +80,10 @@ describe 'nova::compute' do
{ :osfamily => 'RedHat' }
end
it { should contain_service('nova-compute').with(
'name' => 'openstack-nova-compute',
'ensure' => 'stopped',
'enable' => false
'name' => 'openstack-nova-compute',
'ensure' => 'stopped',
'hasstatus' => 'true',
'enable' => false
)}
it { should contain_package('nova-compute').with_name('openstack-nova-compute') }
end

21
spec/classes/nova_network_spec.rb
View File

@ -38,16 +38,18 @@ describe 'nova::network' do
default_params.merge(:enabled => true)
end
it { should contain_service('nova-network').with(
'name' => 'nova-network',
'ensure' => 'running',
'enable' => true
'name' => 'nova-network',
'ensure' => 'running',
'hasstatus' => 'true',
'enable' => true
)}
end
describe 'when enabled is set to false' do
it { should contain_service('nova-network').with(
'name' => 'nova-network',
'ensure' => 'stopped',
'enable' => false
'name' => 'nova-network',
'ensure' => 'stopped',
'hasstatus' => 'true',
'enable' => false
)}
end
end
@ -203,9 +205,10 @@ describe 'nova::network' do
{ :osfamily => 'RedHat' }
end
it { should contain_service('nova-network').with(
'name' => 'openstack-nova-network',
'ensure' => 'stopped',
'enable' => false
'name' => 'openstack-nova-network',
'ensure' => 'stopped',
'hasstatus' => 'true',
'enable' => false
)}
it { should contain_package('nova-network').with_name('openstack-nova-network') }
end

21
spec/classes/nova_objectstore_spec.rb
View File

@ -11,9 +11,10 @@ describe 'nova::objectstore' do
{ :osfamily => 'Debian' }
end
it { should contain_service('nova-objectstore').with(
'name' => 'nova-objectstore',
'ensure' => 'stopped',
'enable' => false
'name' => 'nova-objectstore',
'ensure' => 'stopped',
'hasstatus' => 'true',
'enable' => false
)}
it { should contain_package('nova-objectstore').with(
'name' => 'nova-objectstore',
@ -25,9 +26,10 @@ describe 'nova::objectstore' do
{:enabled => true}
end
it { should contain_service('nova-objectstore').with(
'name' => 'nova-objectstore',
'ensure' => 'running',
'enable' => true
'name' => 'nova-objectstore',
'ensure' => 'running',
'hasstatus' => 'true',
'enable' => true
)}
end
describe 'with package version' do
@ -44,9 +46,10 @@ describe 'nova::objectstore' do
{ :osfamily => 'RedHat' }
end
it { should contain_service('nova-objectstore').with(
'name' => 'openstack-nova-objectstore',
'ensure' => 'stopped',
'enable' => false
'name' => 'openstack-nova-objectstore',
'ensure' => 'stopped',
'hasstatus' => 'true',
'enable' => false
)}
it { should contain_package('nova-objectstore').with_name('openstack-nova-objectstore') }
end

21
spec/classes/nova_scheduler_spec.rb
View File

@ -11,9 +11,10 @@ describe 'nova::scheduler' do
{ :osfamily => 'Debian' }
end
it { should contain_service('nova-scheduler').with(
'name' => 'nova-scheduler',
'ensure' => 'stopped',
'enable' => false
'name' => 'nova-scheduler',
'ensure' => 'stopped',
'hasstatus' => 'true',
'enable' => false
)}
it { should contain_package('nova-scheduler').with(
'name' => 'nova-scheduler',
@ -25,9 +26,10 @@ describe 'nova::scheduler' do
{:enabled => true}
end
it { should contain_service('nova-scheduler').with(
'name' => 'nova-scheduler',
'ensure' => 'running',
'enable' => true
'name' => 'nova-scheduler',
'ensure' => 'running',
'hasstatus' => 'true',
'enable' => true
)}
end
describe 'with package version' do
@ -44,9 +46,10 @@ describe 'nova::scheduler' do
{ :osfamily => 'RedHat' }
end
it { should contain_service('nova-scheduler').with(
'name' => 'openstack-nova-scheduler',
'ensure' => 'stopped',
'enable' => false
'name' => 'openstack-nova-scheduler',
'ensure' => 'stopped',
'hasstatus' => 'true',
'enable' => false
)}
it { should contain_package('nova-scheduler').with_name('openstack-nova-scheduler') }
end

10
spec/classes/nova_vnc_proxy_spec.rb
View File

@ -28,8 +28,9 @@ describe 'nova::vncproxy' do
:ensure => 'present'
) }
it { should contain_service('nova-vncproxy').with(
:name => 'nova-novncproxy',
:ensure => 'running'
:name => 'nova-novncproxy',
:hasstatus => 'true',
:ensure => 'running'
)}
describe 'with package version' do
@ -52,8 +53,9 @@ describe 'nova::vncproxy' do
:ensure => 'present'
)}
it { should contain_service('nova-vncproxy').with(
:name => 'novnc',
:ensure => 'running'
:name => 'novnc',
:hasstatus => 'true',
:ensure => 'running'
)}
end

21
spec/classes/nova_volume_spec.rb
View File

@ -11,9 +11,10 @@ describe 'nova::volume' do
{ :osfamily => 'Debian' }
end
it { should contain_service('nova-volume').with(
'name' => 'nova-volume',
'ensure' => 'stopped',
'enable' => false
'name' => 'nova-volume',
'ensure' => 'stopped',
'hasstatus' => 'true',
'enable' => false
)}
it { should contain_package('nova-volume').with(
'name' => 'nova-volume',
@ -25,9 +26,10 @@ describe 'nova::volume' do
{:enabled => true}
end
it { should contain_service('nova-volume').with(
'name' => 'nova-volume',
'ensure' => 'running',
'enable' => true
'name' => 'nova-volume',
'ensure' => 'running',
'hasstatus' => 'true',
'enable' => true
)}
end
describe 'with package version' do
@ -44,9 +46,10 @@ describe 'nova::volume' do
{ :osfamily => 'RedHat' }
end
it { should contain_service('nova-volume').with(
'name' => 'openstack-nova-volume',
'ensure' => 'stopped',
'enable' => false
'name' => 'openstack-nova-volume',
'ensure' => 'stopped',
'hasstatus' => 'true',
'enable' => false
)}
it { should contain_package('nova-volume').with_name('openstack-nova-volume') }
end