openstack
/
puppet-cinder
Code Issues Proposed changes

Change default value cinder::quota_set::os_auth_url to Keystone V3 

Change-Id: I954b3859a4d29e25ac8aeb46c1ca138c04b3ed33
This commit is contained in:
Tobias Urdin 2019-02-24 02:41:20 +01:00
parent 8f647a94f7
commit 810bebe864
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/quota_set.pp
View File

@ -17,7 +17,7 @@
#
# [*os_auth_url*]
# (Optional) The keystone auth url.
# Defaults to 'http://127.0.0.1:5000/v2.0/'.
# Defaults to 'http://127.0.0.1:5000/v3/'.
#
# [*os_region_name*]
# (Optional) The keystone region name.
@ -49,7 +49,7 @@ define cinder::quota_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,
$quota_volumes = 10,
$quota_snapshots = 10,

5
releasenotes/notes/default-val-quota_set-auth-url-fa7b58f3db7e35b2.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The default value for cinder::quota_set::os_auth_url is now changed from
http://127.0.0.1:5000/v2.0/ to http://127.0.0.1:5000/v3/

6
spec/defines/cinder_quota_set_spec.rb
View File

@ -10,7 +10,7 @@ describe 'cinder::quota_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/',
:quota_volumes => '10',
:quota_snapshots => '10',
:quota_gigabytes => '1000',
@ -26,7 +26,7 @@ describe 'cinder::quota_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/',
],
:onlyif => 'openstack quota show --class default | grep -qP -- -1',
:require => 'Anchor[cinder::install::end]',
@ -44,7 +44,7 @@ describe 'cinder::quota_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/',
'OS_REGION_NAME=test',
],
:onlyif => 'openstack quota show --class default | grep -qP -- -1',

4
spec/unit/provider/cinder_spec.rb
View File

@ -24,7 +24,7 @@ describe Puppet::Provider::Cinder do
it 'should read conf file with all sections' do
creds_hash = {
'auth_url' => 'https://192.168.56.210:5000/v2.0/',
'auth_url' => 'https://192.168.56.210:5000/v3/',
'project_name' => 'admin_tenant',
'username' => 'admin',
'password' => 'password',
@ -33,7 +33,7 @@ describe Puppet::Provider::Cinder do
}
mock = {
'keystone_authtoken' => {
'auth_url' => 'https://192.168.56.210:5000/v2.0/',
'auth_url' => 'https://192.168.56.210:5000/v3/',
'project_name' => 'admin_tenant',
'username' => 'admin',
'password' => 'password',