openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Do not define service resource when service management is disabled"

This commit is contained in:
Zuul 2022-02-16 12:36:39 +00:00 committed by Gerrit Code Review
parent 924701f267 aa2db56179
commit a2df860f52
11 changed files with 47 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/generic_service.pp
View File

@ -62,14 +62,14 @@ define nova::generic_service(
} else {
$service_ensure = 'stopped'
}
}
service { $nova_title:
ensure => $service_ensure,
name => $service_name,
enable => $enabled,
hasstatus => true,
tag => 'nova-service',
service { $nova_title:
ensure => $service_ensure,
name => $service_name,
enable => $enabled,
hasstatus => true,
tag => 'nova-service',
}
}
}
}

40
manifests/metadata/novajoin/api.pp
View File

@ -216,24 +216,28 @@ class nova::metadata::novajoin::api (
} else {
$service_ensure = 'stopped'
}
}
service { 'novajoin-server':
ensure => $service_ensure,
name => $nova::params::novajoin_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'openstack',
}
service { 'novajoin-server':
ensure => $service_ensure,
name => $nova::params::novajoin_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'openstack',
}
service { 'novajoin-notify':
ensure => $service_ensure,
name => $nova::params::notify_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'openstack',
service { 'novajoin-notify':
ensure => $service_ensure,
name => $nova::params::notify_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'openstack',
}
Novajoin_config<||> ~> Service['novajoin-server']
Novajoin_config<||> ~> Service['novajoin-notify']
Exec['get-service-user-keytab'] ~> Service['novajoin-server']
Exec['get-service-user-keytab'] ~> Service['novajoin-notify']
}
exec { 'get-service-user-keytab':
@ -245,9 +249,5 @@ class nova::metadata::novajoin::api (
ensure_resource('file', $keytab, { owner => $username, require => Exec['get-service-user-keytab'] })
Package<| tag == 'novajoin-package' |> -> Exec['get-service-user-keytab']
Novajoin_config<||> ~> Service<| title == 'novajoin-server'|>
Novajoin_config<||> ~> Service<| title == 'novajoin-notify'|>
Exec['get-service-user-keytab'] ~> Service['novajoin-server']
Exec['get-service-user-keytab'] ~> Service['novajoin-notify']
Exec['get-service-user-keytab'] ~> Service<| title == 'nova-api'|>
}

3
spec/classes/nova_api_spec.rb
View File

@ -149,12 +149,11 @@ describe 'nova::api' do
context 'while not managing service state' do
before do
params.merge!({
:enabled => false,
:manage_service => false,
})
end
it { is_expected.to contain_service('nova-api').without_ensure }
it { is_expected.to_not contain_service('nova-api') }
end
context 'with custom instance_name_template' do

6
spec/classes/nova_compute_libvirt_guests_spec.rb
View File

@ -74,12 +74,12 @@ describe 'nova::compute::libvirt_guests' do
context 'while not managing service state' do
let :params do
{ :enabled => false,
:manage_service => false,
{
:manage_service => false,
}
end
it { is_expected.to contain_service('libvirt-guests').without_ensure }
it { is_expected.to_not contain_service('libvirt-guests') }
end
end

4
spec/classes/nova_compute_spec.rb
View File

@ -408,12 +408,12 @@ describe 'nova::compute' do
context 'while not managing service state' do
let :params do
{ :enabled => false,
{
:manage_service => false,
}
end
it { is_expected.to contain_service('nova-compute').without_ensure }
it { is_expected.to_not contain_service('nova-compute') }
end
context 'with instance_usage_audit parameter set to false' do

4
spec/classes/nova_conductor_spec.rb
View File

@ -24,11 +24,11 @@ describe 'nova::conductor' do
context 'with manage_service as false' do
let :params do
{ :enabled => true,
{
:manage_service => false
}
end
it { is_expected.to contain_service('nova-conductor').without_ensure }
it { is_expected.to_not contain_service('nova-conductor') }
end
context 'with package version' do

23
spec/classes/nova_metadata_novajoin_api_spec.rb
View File

@ -16,7 +16,6 @@ describe 'nova::metadata::novajoin::api' do
:join_listen_port => '<SERVICE DEFAULT>',
:keytab => '/etc/novajoin/krb5.keytab',
:log_dir => '/var/log/novajoin',
:manage_service => true,
:username => 'novajoin',
:project_domain_name => 'Default',
:project_name => 'services',
@ -51,7 +50,6 @@ describe 'nova::metadata::novajoin::api' do
:join_listen_port => '9921',
:keytab => '/etc/krb5.conf',
:log_dir => '/var/log/novajoin',
:manage_service => true,
:username => 'novajoin1',
:project_domain_name => 'Default',
:project_name => 'services',
@ -74,7 +72,7 @@ describe 'nova::metadata::novajoin::api' do
it { should contain_class('nova::metadata::novajoin::authtoken') }
it { should contain_service('novajoin-server').with(
'ensure' => (param_hash[:manage_service] && param_hash[:enabled]) ? 'running': 'stopped',
'ensure' => param_hash[:enabled] ? 'running': 'stopped',
'enable' => param_hash[:enabled],
'hasstatus' => true,
'hasrestart' => true,
@ -82,7 +80,7 @@ describe 'nova::metadata::novajoin::api' do
)}
it { should contain_service('novajoin-notify').with(
'ensure' => (param_hash[:manage_service] && param_hash[:enabled]) ? 'running': 'stopped',
'ensure' => param_hash[:enabled] ? 'running': 'stopped',
'enable' => param_hash[:enabled],
'hasstatus' => true,
'hasrestart' => true,
@ -146,28 +144,15 @@ describe 'nova::metadata::novajoin::api' do
let :params do
{
:manage_service => false,
:enabled => false,
:ipa_domain => 'EXAMPLE.COM',
:password => 'my_secret_password',
:transport_url => 'rabbit:rabbit_pass@rabbit_host',
}
end
it { should contain_service('novajoin-server').with(
'ensure' => nil,
'enable' => false,
'hasstatus' => true,
'hasrestart' => true,
'tag' => 'openstack',
)}
it { should_not contain_service('novajoin-server') }
it { should contain_service('novajoin-notify').with(
'ensure' => nil,
'enable' => false,
'hasstatus' => true,
'hasrestart' => true,
'tag' => 'openstack',
)}
it { should_not contain_service('novajoin-notify') }
end
end

4
spec/classes/nova_scheduler_spec.rb
View File

@ -33,11 +33,11 @@ describe 'nova::scheduler' do
context 'with manage_service as false' do
let :params do
{ :enabled => true,
{
:manage_service => false
}
end
it { is_expected.to contain_service('nova-scheduler').without_ensure }
it { is_expected.to_not contain_service('nova-scheduler') }
end
context 'with package version' do

4
spec/classes/nova_serial_proxy_spec.rb
View File

@ -30,11 +30,11 @@ describe 'nova::serialproxy' do
context 'with manage_service as false' do
let :params do
{ :enabled => true,
{
:manage_service => false
}
end
it { is_expected.to contain_service('nova-serialproxy').without_ensure }
it { is_expected.to_not contain_service('nova-serialproxy') }
end
context 'with package version' do

4
spec/classes/nova_spicehtml5proxy_spec.rb
View File

@ -25,12 +25,12 @@ describe 'nova::spicehtml5proxy' do
context 'with manage_service as false' do
let :params do
{ :enabled => true,
{
:manage_service => false
}
end
it { should contain_service('nova-spicehtml5proxy').without_ensure }
it { should_not contain_service('nova-spicehtml5proxy') }
end
context 'with package version' do

4
spec/classes/nova_vnc_proxy_spec.rb
View File

@ -30,12 +30,12 @@ describe 'nova::vncproxy' do
describe 'with manage_service as false' do
let :params do
{ :enabled => true,
{
:manage_service => false
}
end
it { is_expected.to contain_service('nova-vncproxy').without_ensure }
it { is_expected.to_not contain_service('nova-vncproxy') }
end
describe 'with package version' do