From 2b4758de57ba18a565ccbaf0ed61e556ff1624a3 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sun, 24 Feb 2019 13:31:47 +0100 Subject: [PATCH] Change keystone v2.0 to v3 Change-Id: Ic9e4b88949aee48383a4a90d84f569a04eaec8a5 --- manifests/type.pp | 4 ++-- manifests/type_set.pp | 4 ++-- manifests/volume/cinder.pp | 4 ++-- .../notes/change-keystone-v3-5869a77ea56e5e49.yaml | 11 +++++++++++ spec/defines/manila_type_set_spec.rb | 4 ++-- spec/defines/manila_type_spec.rb | 4 ++-- 6 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 releasenotes/notes/change-keystone-v3-5869a77ea56e5e49.yaml diff --git a/manifests/type.pp b/manifests/type.pp index ce4d487e..eb8bf613 100644 --- a/manifests/type.pp +++ b/manifests/type.pp @@ -25,7 +25,7 @@ # (optional) The keystone user name. Defaults to 'admin. # # [*os_auth_url*] -# (optional) The keystone auth url. Defaults to 'http://127.0.0.1:5000/v2.0/'. +# (optional) The keystone auth url. Defaults to 'http://127.0.0.1:5000/v3/'. # # [*os_region_name*] # (optional) The keystone region name. Default is unset. @@ -39,7 +39,7 @@ define manila::type ( $set_value = undef, $os_tenant_name = 'admin', $os_username = 'admin', - $os_auth_url = 'http://127.0.0.1:5000/v2.0/', + $os_auth_url = 'http://127.0.0.1:5000/v3/', $os_region_name = undef, ) { diff --git a/manifests/type_set.pp b/manifests/type_set.pp index bcc4888b..66486bfe 100644 --- a/manifests/type_set.pp +++ b/manifests/type_set.pp @@ -20,7 +20,7 @@ # (optional) The keystone user name. Defaults to 'admin. # # [*os_auth_url*] -# (optional) The keystone auth url. Defaults to 'http://127.0.0.1:5000/v2.0/'. +# (optional) The keystone auth url. Defaults to 'http://127.0.0.1:5000/v3/'. # # [*os_region_name*] # (optional) The keystone region name. Default is unset. @@ -34,7 +34,7 @@ define manila::type_set ( $os_password, $os_tenant_name = 'admin', $os_username = 'admin', - $os_auth_url = 'http://127.0.0.1:5000/v2.0/', + $os_auth_url = 'http://127.0.0.1:5000/v3/', $os_region_name = undef, ) { diff --git a/manifests/volume/cinder.pp b/manifests/volume/cinder.pp index 0e46ed25..7487935e 100644 --- a/manifests/volume/cinder.pp +++ b/manifests/volume/cinder.pp @@ -42,7 +42,7 @@ # # [*cinder_admin_auth_url*] # (optional) Identity service url -# Defaults to 'http://localhost:5000/v2.0' +# Defaults to 'http://localhost:5000/v3' # class manila::volume::cinder ( $cinder_catalog_info = 'volume:cinder:publicURL', @@ -53,7 +53,7 @@ class manila::volume::cinder ( $cinder_admin_username = 'cinder', $cinder_admin_password = undef, $cinder_admin_tenant_name = 'service', - $cinder_admin_auth_url = 'http://localhost:5000/v2.0', + $cinder_admin_auth_url = 'http://localhost:5000/v3', ) { include ::manila::deps diff --git a/releasenotes/notes/change-keystone-v3-5869a77ea56e5e49.yaml b/releasenotes/notes/change-keystone-v3-5869a77ea56e5e49.yaml new file mode 100644 index 00000000..df0ddbad --- /dev/null +++ b/releasenotes/notes/change-keystone-v3-5869a77ea56e5e49.yaml @@ -0,0 +1,11 @@ +--- +upgrade: + - | + The default value for manila::type::os_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 manila::volume::cinder::cinder_admin_auth_url + is changed from http://localhost:5000/v2.0 to http://localhost:5000/v3 + - | + The default value for manila::type_set::os_auth_url is changed from + http://localhost:5000/v2.0 to http://localhost:5000/v3 diff --git a/spec/defines/manila_type_set_spec.rb b/spec/defines/manila_type_set_spec.rb index 1ab3355b..5113da41 100644 --- a/spec/defines/manila_type_set_spec.rb +++ b/spec/defines/manila_type_set_spec.rb @@ -15,7 +15,7 @@ describe 'manila::type_set' do :os_password => 'asdf', :os_tenant_name => 'admin', :os_username => 'admin', - :os_auth_url => 'http://127.127.127.1:5000/v2.0/', + :os_auth_url => 'http://127.127.127.1:5000/v3/', } end @@ -26,7 +26,7 @@ describe 'manila::type_set' do 'OS_TENANT_NAME=admin', 'OS_USERNAME=admin', 'OS_PASSWORD=asdf', - 'OS_AUTH_URL=http://127.127.127.1:5000/v2.0/'], + 'OS_AUTH_URL=http://127.127.127.1:5000/v3/'], :require => 'Anchor[manila::install::end]') end end diff --git a/spec/defines/manila_type_spec.rb b/spec/defines/manila_type_spec.rb index 55f20d3c..b163bd2e 100644 --- a/spec/defines/manila_type_spec.rb +++ b/spec/defines/manila_type_spec.rb @@ -15,7 +15,7 @@ describe 'manila::type' do :os_password => 'asdf', :os_tenant_name => 'admin', :os_username => 'admin', - :os_auth_url => 'http://127.127.127.1:5000/v2.0/', + :os_auth_url => 'http://127.127.127.1:5000/v3/', :driver_handles_share_servers => 'true', } end @@ -27,7 +27,7 @@ describe 'manila::type' do 'OS_TENANT_NAME=admin', 'OS_USERNAME=admin', 'OS_PASSWORD=asdf', - 'OS_AUTH_URL=http://127.127.127.1:5000/v2.0/'], + 'OS_AUTH_URL=http://127.127.127.1:5000/v3/'], :unless => 'manila type-list | grep hippo', :require => 'Anchor[manila::install::end]') is_expected.to contain_exec('manila type-key hippo set volume_backend_name=name1')