openstack
/
puppet-swift
Code Issues Proposed changes

Merge "Change keystone v2.0 to v3"

This commit is contained in:
Zuul 2019-02-25 19:22:04 +00:00 committed by Gerrit Code Review
parent 7366adca84 801104f359
commit 53bec29e29
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/auth_file.pp
View File

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

2
manifests/dispersion.pp
View File

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

8
releasenotes/notes/change-keystone-v3-dd97e1db169b9b62.yaml Normal file
View File

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

2
spec/classes/swift_dispersion_spec.rb
View File

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

4
spec/classes/swift_proxy_authtoken_spec.rb
View File

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