From ff0330a998bf23809a46a24ab0b76081f61af30e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 26 Nov 2021 14:54:09 +0900 Subject: [PATCH] Use consistent spelling, OpenStack, instead of Openstack Change-Id: I197ccb6ece967271e8751c0596879d155659521e --- manifests/keystone/auth.pp | 8 ++++---- spec/classes/swift_keystone_auth_spec.rb | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 05c7bcde..073adce0 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -65,11 +65,11 @@ # # [*service_description*] # (optional) Description for keystone service. -# Defaults to 'Openstack Object-Store Service'. +# Defaults to 'OpenStack Object-Store Service'. # # [*service_description_s3*] # (optional) Description for keystone s3 service. -# Defaults to 'Openstack S3 Service'. +# Defaults to 'OpenStack S3 Service'. # # [*public_url*] # (optional) The endpoint's public url. (Defaults to 'http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s') @@ -106,8 +106,8 @@ class swift::keystone::auth( $service_name_s3 = 'swift_s3', $service_type = 'object-store', $service_type_s3 = 's3', - $service_description = 'Openstack Object-Store Service', - $service_description_s3 = 'Openstack S3 Service', + $service_description = 'OpenStack Object-Store Service', + $service_description_s3 = 'OpenStack S3 Service', $configure_endpoint = true, $configure_s3_endpoint = true, $configure_user = true, diff --git a/spec/classes/swift_keystone_auth_spec.rb b/spec/classes/swift_keystone_auth_spec.rb index 79c7b4d6..5fd233c9 100644 --- a/spec/classes/swift_keystone_auth_spec.rb +++ b/spec/classes/swift_keystone_auth_spec.rb @@ -17,7 +17,7 @@ describe 'swift::keystone::auth' do :configure_endpoint => true, :service_name => 'swift', :service_type => 'object-store', - :service_description => 'Openstack Object-Store Service', + :service_description => 'OpenStack Object-Store Service', :region => 'RegionOne', :auth_name => 'swift', :password => 'swift_password', @@ -34,7 +34,7 @@ describe 'swift::keystone::auth' do :configure_endpoint => true, :service_name => 'swift_s3', :service_type => 's3', - :service_description => 'Openstack S3 Service', + :service_description => 'OpenStack S3 Service', :region => 'RegionOne', :public_url => 'http://127.0.0.1:8080', :internal_url => 'http://127.0.0.1:8080', @@ -59,10 +59,10 @@ describe 'swift::keystone::auth' do :configure_s3_endpoint => false, :configure_user => false, :configure_user_role => false, - :service_description => 'Alternative Openstack Object-Store Service', + :service_description => 'Alternative OpenStack Object-Store Service', :service_name => 'alt_service', :service_type => 'alt_object-store', - :service_description_s3 => 'Alternative Openstack S3 Service', + :service_description_s3 => 'Alternative OpenStack S3 Service', :service_name_s3 => 'alt_service_s3', :service_type_s3 => 'alt_s3', :region => 'RegionTwo', @@ -79,7 +79,7 @@ describe 'swift::keystone::auth' do :configure_endpoint => false, :service_name => 'alt_service', :service_type => 'alt_object-store', - :service_description => 'Alternative Openstack Object-Store Service', + :service_description => 'Alternative OpenStack Object-Store Service', :region => 'RegionTwo', :auth_name => 'alt_swift', :password => 'swift_password', @@ -95,7 +95,7 @@ describe 'swift::keystone::auth' do :configure_endpoint => false, :service_name => 'alt_service_s3', :service_type => 'alt_s3', - :service_description => 'Alternative Openstack S3 Service', + :service_description => 'Alternative OpenStack S3 Service', :region => 'RegionTwo', :public_url => 'http://127.0.0.1:8080', :internal_url => 'http://127.0.0.1:8080',