diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 5e1f7066..49679850 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -36,6 +36,10 @@ # (Optional) Should the admin role be configured for the service user? # Defaults to true # +# [*configure_service*] +# (Optional) Should the service be configurd? +# Defaults to True +# # [*service_type*] # (Optional) Type of service. # Defaults to 'share'. @@ -83,6 +87,10 @@ # (Optional) Should Manila v2 endpoint be configured? # Defaults to true. # +# [*configure_service_v2*] +# (Optional) Should the service v2 be configurd? +# Defaults to True +# # [*service_type_v2*] # (Optional) Type of service v2. Optional. # Defaults to 'sharev2'. @@ -150,6 +158,8 @@ class manila::keystone::auth ( Boolean $configure_endpoint_v2 = true, Boolean $configure_user = true, Boolean $configure_user_role = true, + Boolean $configure_service = true, + Boolean $configure_service_v2 = true, String[1] $service_type = 'share', String[1] $service_type_v2 = 'sharev2', String[1] $service_description = 'Manila Service', @@ -191,6 +201,7 @@ and will be removed in a future release.") configure_user => $configure_user, configure_user_role => $configure_user_role, configure_endpoint => $configure_endpoint, + configure_service => $configure_service, service_type => $service_type, service_description => $service_description, auth_name => $auth_name, @@ -211,6 +222,7 @@ and will be removed in a future release.") configure_user => $configure_user_v2, configure_user_role => $configure_user_role_v2, configure_endpoint => $configure_endpoint_v2, + configure_service => $configure_service_v2, service_type => $service_type_v2, service_description => $service_description_v2, auth_name => $auth_name_v2, diff --git a/releasenotes/notes/configure_service-054ca05f190ce796.yaml b/releasenotes/notes/configure_service-054ca05f190ce796.yaml new file mode 100644 index 00000000..c45eb8b7 --- /dev/null +++ b/releasenotes/notes/configure_service-054ca05f190ce796.yaml @@ -0,0 +1,8 @@ +--- +features: + - | + The following parameters have been added to the ``manila::keystone::auth`` + class. + + - ``configure_service`` + - ``configure_service_v2`` diff --git a/spec/classes/manila_keystone_auth_spec.rb b/spec/classes/manila_keystone_auth_spec.rb index ce2480d8..ba7e3b92 100644 --- a/spec/classes/manila_keystone_auth_spec.rb +++ b/spec/classes/manila_keystone_auth_spec.rb @@ -15,6 +15,7 @@ describe 'manila::keystone::auth' do :configure_user => true, :configure_user_role => true, :configure_endpoint => true, + :configure_service => true, :service_name => 'manila', :service_type => 'share', :service_description => 'Manila Service', @@ -35,6 +36,7 @@ describe 'manila::keystone::auth' do :configure_user => false, :configure_user_role => false, :configure_endpoint => true, + :configure_service => true, :service_name => 'manilav2', :service_type => 'sharev2', :service_description => 'Manila Service v2', @@ -64,6 +66,7 @@ describe 'manila::keystone::auth' do :configure_endpoint => false, :configure_user => false, :configure_user_role => false, + :configure_service => false, :service_description => 'Alternative Manila Service', :service_name => 'alt_service', :service_type => 'alt_share', @@ -75,6 +78,7 @@ describe 'manila::keystone::auth' do :auth_name_v2 => 'alt_manilav2', :email_v2 => 'alt_manilav2@alt_localhost', :configure_endpoint_v2 => false, + :configure_service_v2 => false, :configure_user_v2 => true, :configure_user_role_v2 => true, :service_description_v2 => 'Alternative Manila Service v2', @@ -89,6 +93,7 @@ describe 'manila::keystone::auth' do :configure_user => false, :configure_user_role => false, :configure_endpoint => false, + :configure_service => false, :service_name => 'alt_service', :service_type => 'alt_share', :service_description => 'Alternative Manila Service', @@ -109,6 +114,7 @@ describe 'manila::keystone::auth' do :configure_user => true, :configure_user_role => true, :configure_endpoint => false, + :configure_service => false, :service_name => 'alt_servicev2', :service_type => 'alt_sharev2', :service_description => 'Alternative Manila Service v2',