add parameter to specify if service on keystone should be configured

The added parameter should be deprecated in one of the next steps,
since there is no ceilometer api for several releases !

Change-Id: Ia579cf24a5e837487216329fe994cb030c1b3929
This commit is contained in:
Benedikt Trefzer 2020-10-20 16:40:45 +02:00
parent a45dd69aca
commit 5023a2c51f
3 changed files with 29 additions and 0 deletions

View File

@ -19,6 +19,11 @@
# (Optional) Should Ceilometer endpoint be configured. # (Optional) Should Ceilometer endpoint be configured.
# Defaults to true. # Defaults to true.
# #
# [*configure_service*]
# (Optional) Whether to create the service.
# Default to True
# Remark: will be deprecated in wallaby cycle
#
# [*configure_user*] # [*configure_user*]
# (Optional) Should Ceilometer service user be configured? # (Optional) Should Ceilometer service user be configured?
# Defaults to true. # Defaults to true.
@ -82,6 +87,7 @@ class ceilometer::keystone::auth (
$region = 'RegionOne', $region = 'RegionOne',
$tenant = 'services', $tenant = 'services',
$configure_endpoint = true, $configure_endpoint = true,
Boolean $configure_service = true,
$public_url = 'http://127.0.0.1:8777', $public_url = 'http://127.0.0.1:8777',
$admin_url = 'http://127.0.0.1:8777', $admin_url = 'http://127.0.0.1:8777',
$internal_url = 'http://127.0.0.1:8777', $internal_url = 'http://127.0.0.1:8777',
@ -95,6 +101,7 @@ class ceilometer::keystone::auth (
configure_user => $configure_user, configure_user => $configure_user,
configure_user_role => $configure_user_role, configure_user_role => $configure_user_role,
configure_endpoint => $configure_endpoint, configure_endpoint => $configure_endpoint,
configure_service => $configure_service,
service_type => $service_type, service_type => $service_type,
service_description => $service_description, service_description => $service_description,
service_name => $service_name, service_name => $service_name,

View File

@ -0,0 +1,6 @@
---
features:
- |
Add parameter to ceilometer::keystone::auth to disable the creation
of keystone ceilometer service (used in catalog).
remark: parameter will be deprecated in wallaby cycle !

View File

@ -8,6 +8,7 @@ describe 'ceilometer::keystone::auth' do
:auth_name => 'ceilometer', :auth_name => 'ceilometer',
:service_name => 'ceilometer', :service_name => 'ceilometer',
:configure_endpoint => true, :configure_endpoint => true,
:configure_service => true,
:service_type => 'metering', :service_type => 'metering',
:region => 'RegionOne', :region => 'RegionOne',
:tenant => 'services', :tenant => 'services',
@ -167,6 +168,21 @@ describe 'ceilometer::keystone::auth' do
)} )}
end end
context 'when disabling service and endpoint configuration' do
before do
params.merge!(
:configure_service => false,
:configure_endpoint => false
)
end
it { is_expected.to_not contain_keystone_service('ceilometer::metering') }
it { is_expected.to_not contain_keystone_endpoint("#{default_params[:region]}/#{default_params[:service_name]}::#{default_params[:service_type]}")}
it { is_expected.to contain_keystone_user('ceilometer') }
it { is_expected.to contain_keystone_user_role('ceilometer@services') }
end
end end
on_supported_os({ on_supported_os({