openstack/puppet-manila
Code Issues Proposed changes

Change keystone v2.0 to v3

Browse Source 
Change-Id: Ic9e4b88949aee48383a4a90d84f569a04eaec8a5
This commit is contained in:
Tobias Urdin 2019-02-24 13:31:47 +01:00
parent 496a58a765
commit 2b4758de57
6 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/type.pp
View File

@ -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,
) {

4
manifests/type_set.pp
View File

@ -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,
) {

4
manifests/volume/cinder.pp
View File

@ -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

11
releasenotes/notes/change-keystone-v3-5869a77ea56e5e49.yaml Normal file
View File

@ -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

4
spec/defines/manila_type_set_spec.rb
View File

@ -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

4
spec/defines/manila_type_spec.rb
View File

@ -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')