openstack
/
puppet-aodh
Code Issues Proposed changes

Merge "Fix rspec-puppet 2.7.1 support"

This commit is contained in:
Zuul 2020-10-01 20:09:51 +00:00 committed by Gerrit Code Review
parent 3f02d3f43c f2b581e6a7
commit 4620cd4dd1
9 changed files with 68 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
manifests/api.pp
View File

@ -76,42 +76,42 @@ class aodh::api (
tag => ['openstack', 'aodh-package'],
}
if $manage_service {
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
}
if $sync_db {
include aodh::db::sync
}
if $service_name == $::aodh::params::api_service_name {
service { 'aodh-api':
ensure => $service_ensure,
name => $::aodh::params::api_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'aodh-service',
}
} elsif $service_name == 'httpd' {
include apache::params
service { 'aodh-api':
ensure => 'stopped',
name => $::aodh::params::api_service_name,
enable => false,
tag => 'aodh-service',
}
Service <| title == 'httpd' |> { tag +> 'aodh-service' }
if $manage_service {
if $service_name == $::aodh::params::api_service_name {
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
# we need to make sure aodh-api/eventlet is stopped before trying to start apache
Service['aodh-api'] -> Service[$service_name]
} else {
fail("Invalid service_name. Either aodh/openstack-aodh-api for running \
service { 'aodh-api':
ensure => $service_ensure,
name => $::aodh::params::api_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'aodh-service',
}
} elsif $service_name == 'httpd' {
include apache::params
service { 'aodh-api':
ensure => 'stopped',
name => $::aodh::params::api_service_name,
enable => false,
tag => 'aodh-service',
}
Service <| title == 'httpd' |> { tag +> 'aodh-service' }
# we need to make sure aodh-api/eventlet is stopped before trying to start apache
Service['aodh-api'] -> Service[$service_name]
} else {
fail("Invalid service_name. Either aodh/openstack-aodh-api for running \
as a standalone service, or httpd for being run by a httpd server")
}
}
aodh_config {

7
manifests/db.pp
View File

@ -70,7 +70,12 @@ class aodh::db (
include aodh::deps
if $::aodh::database_min_pool_size or $database_min_pool_size {
if defined('$::aodh::database_min_pool_size') {
$database_min_pool_size_real = $::aodh::database_min_pool_size
} else {
$database_min_pool_size_real = $database_min_pool_size
}
if $database_min_pool_size_real {
warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.')
}

16
manifests/evaluator.pp
View File

@ -58,14 +58,14 @@ class aodh::evaluator (
} else {
$service_ensure = 'stopped'
}
}
service { 'aodh-evaluator':
ensure => $service_ensure,
name => $::aodh::params::evaluator_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['aodh-service','aodh-db-sync-service']
service { 'aodh-evaluator':
ensure => $service_ensure,
name => $::aodh::params::evaluator_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['aodh-service','aodh-db-sync-service']
}
}
}

16
manifests/listener.pp
View File

@ -33,14 +33,14 @@ class aodh::listener (
} else {
$service_ensure = 'stopped'
}
}
service { 'aodh-listener':
ensure => $service_ensure,
name => $::aodh::params::listener_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'aodh-service',
service { 'aodh-listener':
ensure => $service_ensure,
name => $::aodh::params::listener_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'aodh-service',
}
}
}

16
manifests/notifier.pp
View File

@ -33,14 +33,14 @@ class aodh::notifier (
} else {
$service_ensure = 'stopped'
}
}
service { 'aodh-notifier':
ensure => $service_ensure,
name => $::aodh::params::notifier_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'aodh-service',
service { 'aodh-notifier':
ensure => $service_ensure,
name => $::aodh::params::notifier_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'aodh-service',
}
}
}

11
spec/classes/aodh_api_spec.rb
View File

@ -111,15 +111,8 @@ describe 'aodh::api' do
:enabled => false })
end
it 'configures aodh-api service' do
is_expected.to contain_service('aodh-api').with(
:ensure => nil,
:name => platform_params[:api_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'aodh-service',
)
it 'should not configure aodh-api service' do
is_expected.to_not contain_service('aodh-api')
end
end

11
spec/classes/aodh_evaluator_spec.rb
View File

@ -87,15 +87,8 @@ describe 'aodh::evaluator' do
:manage_service => false }
end
it 'configures aodh-evaluator service' do
is_expected.to contain_service('aodh-evaluator').with(
:ensure => nil,
:name => platform_params[:evaluator_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => ['aodh-service','aodh-db-sync-service']
)
it 'should not configure aodh-evaluator service' do
is_expected.to_not contain_service('aodh-evaluator')
end
end
end

11
spec/classes/aodh_listener_spec.rb
View File

@ -56,15 +56,8 @@ describe 'aodh::listener' do
:manage_service => false }
end
it 'configures aodh-listener service' do
is_expected.to contain_service('aodh-listener').with(
:ensure => nil,
:name => platform_params[:listener_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'aodh-service',
)
it 'should not configure aodh-listener service' do
is_expected.to_not contain_service('aodh-listener')
end
end
end

11
spec/classes/aodh_notifier_spec.rb
View File

@ -56,15 +56,8 @@ describe 'aodh::notifier' do
:manage_service => false }
end
it 'configures aodh-notifier service' do
is_expected.to contain_service('aodh-notifier').with(
:ensure => nil,
:name => platform_params[:notifier_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'aodh-service',
)
it 'should not configure aodh-notifier service' do
is_expected.to_not contain_service('aodh-notifier')
end
end
end