openstack/puppet-cinder
Code Issues Proposed changes

Expose configure_service

Browse Source 
This parameter has been implemented in the underlying defined resource
type but was not configurable.

Change-Id: I411e0741a923d65aaca91d5167762f46a4f39e02
This commit is contained in:
Takashi Kajinami 2024-09-18 14:56:29 +09:00
parent b897bfdcdb
commit 7e0cc4f7d4
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/keystone/auth.pp
View File

@ -27,6 +27,10 @@
# (Optional) Should the admin role be configured for the service user? # (Optional) Should the admin role be configured for the service user?
# Defaults to true # Defaults to true
# #
# [*configure_service_v3*]
# (Optional) Should the service be configured?
# Defaults to True
#
# [*service_name_v3*] # [*service_name_v3*]
# (Optional) Name of the v3 service. # (Optional) Name of the v3 service.
# Defaults to 'cinderv3'. # Defaults to 'cinderv3'.
@ -134,6 +138,7 @@ class cinder::keystone::auth (
Boolean $configure_endpoint_v3 = true, Boolean $configure_endpoint_v3 = true,
Boolean $configure_user = true, Boolean $configure_user = true,
Boolean $configure_user_role = true, Boolean $configure_user_role = true,
Boolean $configure_service_v3 = true,
String[1] $service_name_v3 = 'cinderv3', String[1] $service_name_v3 = 'cinderv3',
String[1] $service_type_v3 = 'volumev3', String[1] $service_type_v3 = 'volumev3',
String[1] $service_description_v3 = 'Cinder Service v3', String[1] $service_description_v3 = 'Cinder Service v3',
@ -181,6 +186,7 @@ and will be removed in a future release.")
configure_user => $configure_user_v3, configure_user => $configure_user_v3,
configure_user_role => $configure_user_role_v3, configure_user_role => $configure_user_role_v3,
configure_endpoint => $configure_endpoint_v3, configure_endpoint => $configure_endpoint_v3,
configure_service => $configure_service_v3,
service_type => $service_type_v3, service_type => $service_type_v3,
service_description => $service_description_v3, service_description => $service_description_v3,
service_name => $service_name_v3, service_name => $service_name_v3,

5
releasenotes/notes/configure_service-e5e355b83ecbeb9f.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``cinder::keystone::auth::configure_service_v3`` parameter has been
added.

6
spec/classes/cinder_keystone_auth_spec.rb
View File

@ -30,6 +30,7 @@ describe 'cinder::keystone::auth' do
:configure_user => false, :configure_user => false,
:configure_user_role => false, :configure_user_role => false,
:configure_endpoint => true, :configure_endpoint => true,
:configure_service => true,
:service_name => 'cinderv3', :service_name => 'cinderv3',
:service_type => 'volumev3', :service_type => 'volumev3',
:service_description => 'Cinder Service v3', :service_description => 'Cinder Service v3',
@ -73,7 +74,9 @@ describe 'cinder::keystone::auth' do
:public_url_v3 => 'https://10.10.10.10:80', :public_url_v3 => 'https://10.10.10.10:80',
:internal_url_v3 => 'http://10.10.10.11:81', :internal_url_v3 => 'http://10.10.10.11:81',
:admin_url_v3 => 'http://10.10.10.12:81', :admin_url_v3 => 'http://10.10.10.12:81',
:configure_endpoint_v3 => false } :configure_endpoint_v3 => false,
:configure_service_v3 => false
}
end end
it { is_expected.to contain_keystone__resource__service_identity('cinder').with( it { is_expected.to contain_keystone__resource__service_identity('cinder').with(
@ -95,6 +98,7 @@ describe 'cinder::keystone::auth' do
:configure_user => true, :configure_user => true,
:configure_user_role => true, :configure_user_role => true,
:configure_endpoint => false, :configure_endpoint => false,
:configure_service => false,
:service_name => 'alt_servicev3', :service_name => 'alt_servicev3',
:service_type => 'alt_volumev3', :service_type => 'alt_volumev3',
:service_description => 'Alternative Cinder Service v3', :service_description => 'Alternative Cinder Service v3',