diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index cd801a59..f7714393 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -43,6 +43,10 @@ # (Optional) Should the admin role be configured for the service user? # Defaults to true. # +# [*configure_service*] +# (Optional) Should the service be configured? +# Defaults to True +# # [*service_type*] # (Optional) Type of service. # Defaults to 'key-manager'. @@ -85,6 +89,7 @@ class barbican::keystone::auth ( Boolean $configure_endpoint = true, Boolean $configure_user = true, Boolean $configure_user_role = true, + Boolean $configure_service = true, String[1] $service_description = 'OpenStack Key Manager Service', String[1] $service_name = 'barbican', String[1] $service_type = 'key-manager', @@ -102,6 +107,7 @@ class barbican::keystone::auth ( configure_user => $configure_user, configure_user_role => $configure_user_role, configure_endpoint => $configure_endpoint, + configure_service => $configure_service, service_name => $service_name, service_type => $service_type, service_description => $service_description, diff --git a/releasenotes/notes/configure_service-61ed7d0299efa5ab.yaml b/releasenotes/notes/configure_service-61ed7d0299efa5ab.yaml new file mode 100644 index 00000000..3a640dfb --- /dev/null +++ b/releasenotes/notes/configure_service-61ed7d0299efa5ab.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``barbican::keystone::auth::configure_service`` parameter has been + added. diff --git a/spec/classes/barbican_keystone_auth_spec.rb b/spec/classes/barbican_keystone_auth_spec.rb index 6fc4810e..a4321534 100644 --- a/spec/classes/barbican_keystone_auth_spec.rb +++ b/spec/classes/barbican_keystone_auth_spec.rb @@ -12,9 +12,10 @@ describe 'barbican::keystone::auth' do end it { is_expected.to contain_keystone__resource__service_identity('barbican').with( + :configure_endpoint => true, :configure_user => true, :configure_user_role => true, - :configure_endpoint => true, + :configure_service => true, :service_name => 'barbican', :service_type => 'key-manager', :service_description => 'OpenStack Key Manager Service', @@ -44,6 +45,7 @@ describe 'barbican::keystone::auth' do :configure_endpoint => false, :configure_user => false, :configure_user_role => false, + :configure_service => false, :service_description => 'Alternative OpenStack Key Manager Service', :service_name => 'alt_service', :service_type => 'alt_key-manager', @@ -57,6 +59,7 @@ describe 'barbican::keystone::auth' do :configure_user => false, :configure_user_role => false, :configure_endpoint => false, + :configure_service => false, :service_name => 'alt_service', :service_type => 'alt_key-manager', :service_description => 'Alternative OpenStack Key Manager Service',