openstack/puppet-aodh
Code Issues Proposed changes

Merge "Configure the Ceilometer project name"

Browse Source
This commit is contained in:
Jenkins 2017-07-19 12:34:22 +00:00 committed by Gerrit Code Review
commit ba1c716cd8
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/api.pp
View File

@ -44,6 +44,10 @@
# HTTPProxyToWSGI middleware.
# Defaults to $::os_service_default.
#
# [*gnocchi_external_project_owner*]
# (optional) Gnocchi external project owner (usually Ceilometer project name)
# Defaults to 'services'
#
class aodh::api (
$manage_service = true,
$enabled = true,
@ -54,6 +58,7 @@ class aodh::api (
$sync_db = false,
$auth_strategy = 'keystone',
$enable_proxy_headers_parsing = $::os_service_default,
$gnocchi_external_project_owner = 'services',
) inherits aodh::params {
@ -109,8 +114,9 @@ as a standalone service, or httpd for being run by a httpd server")
}
aodh_config {
'api/host': value => $host;
'api/port': value => $port;
'api/gnocchi_external_project_owner': value => $gnocchi_external_project_owner;
'api/host': value => $host;
'api/port': value => $port;
}
oslo::middleware { 'aodh_config':

8
spec/classes/aodh_api_spec.rb
View File

@ -36,6 +36,7 @@ describe 'aodh::api' do
it 'configures api' do
is_expected.to contain_aodh_config('api/host').with_value( params[:host] )
is_expected.to contain_aodh_config('api/port').with_value( params[:port] )
is_expected.to contain_aodh_config('api/gnocchi_external_project_owner').with_value( 'services' )
is_expected.to contain_aodh_config('oslo_middleware/enable_proxy_headers_parsing').with_value('<SERVICE DEFAULT>')
end
@ -76,6 +77,13 @@ describe 'aodh::api' do
it { is_expected.to contain_aodh_config('oslo_middleware/enable_proxy_headers_parsing').with_value(true) }
end
context 'with gnocchi_external_project_owner' do
before do
params.merge!({:gnocchi_external_project_owner => 'gnocchi-project' })
end
it { is_expected.to contain_aodh_config('api/gnocchi_external_project_owner').with_value('gnocchi-project') }
end
context 'with disabled service managing' do
before do
params.merge!({