diff --git a/manifests/api.pp b/manifests/api.pp index 19544456..3cc7b23b 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -48,6 +48,10 @@ # (optional) Gnocchi external project owner (usually Ceilometer project name) # Defaults to 'services' # +# [*gnocchi_external_domain_name*] +# (optional) Domain name of resources creator in Gnocchi. +# Defaults to 'Default' +# class aodh::api ( $manage_service = true, $enabled = true, @@ -59,6 +63,7 @@ class aodh::api ( $max_request_body_size = $::os_service_default, $paste_config = $::os_service_default, $gnocchi_external_project_owner = 'services', + $gnocchi_external_domain_name = 'Default', ) inherits aodh::params { @@ -116,6 +121,7 @@ as a standalone service, or httpd for being run by a httpd server") aodh_config { 'api/gnocchi_external_project_owner': value => $gnocchi_external_project_owner; + 'api/gnocchi_external_domain_name': value => $gnocchi_external_domain_name; 'api/paste_config': value => $paste_config; } diff --git a/releasenotes/notes/gnocchi_external_domain_name-b592696cefac2242.yaml b/releasenotes/notes/gnocchi_external_domain_name-b592696cefac2242.yaml new file mode 100644 index 00000000..d3acf913 --- /dev/null +++ b/releasenotes/notes/gnocchi_external_domain_name-b592696cefac2242.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``aodh::api::gnocchi_external_domain_name`` parameter has been + added. diff --git a/spec/classes/aodh_api_spec.rb b/spec/classes/aodh_api_spec.rb index 4ff5a2db..687a896d 100644 --- a/spec/classes/aodh_api_spec.rb +++ b/spec/classes/aodh_api_spec.rb @@ -32,7 +32,8 @@ describe 'aodh::api' do end it 'configures api' do - is_expected.to contain_aodh_config('api/gnocchi_external_project_owner').with_value( 'services' ) + is_expected.to contain_aodh_config('api/gnocchi_external_project_owner').with_value('services') + is_expected.to contain_aodh_config('api/gnocchi_external_domain_name').with_value('Default') is_expected.to contain_aodh_config('api/paste_config').with_value('') is_expected.to contain_oslo__middleware('aodh_config').with( :enable_proxy_headers_parsing => '', @@ -97,12 +98,18 @@ describe 'aodh::api' do it { is_expected.to contain_aodh_config('api/paste_config').with_value('/etc/aodh/api-paste.ini') } end - context 'with gnocchi_external_project_owner' do + context 'with gnocchi parameters' do before do - params.merge!({:gnocchi_external_project_owner => 'gnocchi-project' }) + params.merge!({ + :gnocchi_external_project_owner => 'gnocchi-project', + :gnocchi_external_domain_name => 'MyDomain' + }) end - it { is_expected.to contain_aodh_config('api/gnocchi_external_project_owner').with_value('gnocchi-project') } + it 'configures gnocchi parameters' do + is_expected.to contain_aodh_config('api/gnocchi_external_project_owner').with_value('gnocchi-project') + is_expected.to contain_aodh_config('api/gnocchi_external_domain_name').with_value('MyDomain') + end end context 'with disabled service managing' do before do