diff --git a/manifests/auth_file.pp b/manifests/auth_file.pp index ec9d1f99..8e2edd01 100644 --- a/manifests/auth_file.pp +++ b/manifests/auth_file.pp @@ -13,7 +13,7 @@ # # [*auth_url*] # (optional) The authentication URL -# Defaults to 'http://127.0.0.1:5000/v2.0/' +# Defaults to 'http://127.0.0.1:5000/v3/' # # [*admin_password*] # (required) The password for the swift user @@ -22,7 +22,7 @@ class swift::auth_file ( $admin_tenant, $admin_password, $admin_user = 'admin', - $auth_url = 'http://127.0.0.1:5000/v2.0/' + $auth_url = 'http://127.0.0.1:5000/v3/' ) { include ::swift::deps diff --git a/manifests/dispersion.pp b/manifests/dispersion.pp index a740360b..6b097f12 100644 --- a/manifests/dispersion.pp +++ b/manifests/dispersion.pp @@ -67,7 +67,7 @@ # Francois Charlier fcharlier@ploup.net # class swift::dispersion ( - $auth_url = 'http://127.0.0.1:5000/v2.0/', + $auth_url = 'http://127.0.0.1:5000/v3/', $auth_user = 'dispersion', $auth_tenant = 'services', $auth_pass = 'dispersion_password', diff --git a/releasenotes/notes/change-keystone-v3-dd97e1db169b9b62.yaml b/releasenotes/notes/change-keystone-v3-dd97e1db169b9b62.yaml new file mode 100644 index 00000000..244b0351 --- /dev/null +++ b/releasenotes/notes/change-keystone-v3-dd97e1db169b9b62.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + The default value for swift::dispersion::auth_url is changed + from http://127.0.0.1:5000/v2.0/ to http://127.0.0.1:5000/v3/ + - | + The default value for swift::auth_file::auth_url is changed + from http://127.0.0.1:5000/v2.0/ to http://127.0.0.1:5000/v3/ diff --git a/spec/classes/swift_dispersion_spec.rb b/spec/classes/swift_dispersion_spec.rb index 1b4c8cdf..1313416f 100644 --- a/spec/classes/swift_dispersion_spec.rb +++ b/spec/classes/swift_dispersion_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe 'swift::dispersion' do let :default_params do - { :auth_url => 'http://127.0.0.1:5000/v2.0/', + { :auth_url => 'http://127.0.0.1:5000/v3/', :auth_user => 'dispersion', :auth_tenant => 'services', :auth_pass => 'dispersion_password', diff --git a/spec/classes/swift_proxy_authtoken_spec.rb b/spec/classes/swift_proxy_authtoken_spec.rb index 3a78a6b3..e055f0d3 100644 --- a/spec/classes/swift_proxy_authtoken_spec.rb +++ b/spec/classes/swift_proxy_authtoken_spec.rb @@ -83,12 +83,12 @@ describe 'swift::proxy::authtoken' do describe "when both www_authenticate_uri and identity_uri are set" do let :params do { - :www_authenticate_uri => 'https://foo.bar:5000/v2.0/', + :www_authenticate_uri => 'https://foo.bar:5000/v3/', :identity_uri => 'https://foo.bar:5000/' } end - it { is_expected.to contain_swift_proxy_config('filter:authtoken/www_authenticate_uri').with_value('https://foo.bar:5000/v2.0/') } + it { is_expected.to contain_swift_proxy_config('filter:authtoken/www_authenticate_uri').with_value('https://foo.bar:5000/v3/') } it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_url').with_value('https://foo.bar:5000/') } end end