Merge "Switch to use keystone v3"
This commit is contained in:
commit
4eb6e9b75f
@ -3,7 +3,7 @@
|
||||
# == Parameters
|
||||
# [*auth_url*]
|
||||
# (Optional) The keystone public endpoint
|
||||
# Defaults to 'http://localhost:5000/v2.0'
|
||||
# Defaults to 'http://localhost:5000/v3'
|
||||
#
|
||||
# [*auth_region*]
|
||||
# (Optional) The keystone region of this node
|
||||
@ -48,7 +48,7 @@
|
||||
#
|
||||
class vitrage::auth (
|
||||
$auth_password,
|
||||
$auth_url = 'http://localhost:5000/v2.0',
|
||||
$auth_url = 'http://localhost:5000/v3',
|
||||
$auth_region = 'RegionOne',
|
||||
$auth_user = 'vitrage',
|
||||
$auth_tenant_name = 'services',
|
||||
|
@ -52,7 +52,7 @@ describe 'basic vitrage' do
|
||||
ssl => false,
|
||||
}
|
||||
class { '::vitrage::auth':
|
||||
auth_url => 'http://127.0.0.1:5000/v2.0',
|
||||
auth_url => 'http://127.0.0.1:5000/v3',
|
||||
auth_password => 'a_big_secret',
|
||||
}
|
||||
class { '::vitrage::client': }
|
||||
|
@ -3,7 +3,7 @@ require 'spec_helper'
|
||||
describe 'vitrage::auth' do
|
||||
|
||||
let :params do
|
||||
{ :auth_url => 'http://localhost:5000/v2.0',
|
||||
{ :auth_url => 'http://localhost:5000/v3',
|
||||
:auth_region => 'RegionOne',
|
||||
:auth_user => 'vitrage',
|
||||
:auth_password => 'password',
|
||||
@ -14,7 +14,7 @@ describe 'vitrage::auth' do
|
||||
shared_examples_for 'vitrage-auth' do
|
||||
|
||||
it 'configures authentication' do
|
||||
is_expected.to contain_vitrage_config('service_credentials/auth_url').with_value('http://localhost:5000/v2.0')
|
||||
is_expected.to contain_vitrage_config('service_credentials/auth_url').with_value('http://localhost:5000/v3')
|
||||
is_expected.to contain_vitrage_config('service_credentials/region_name').with_value('RegionOne')
|
||||
is_expected.to contain_vitrage_config('service_credentials/project_domain_id').with_value('default')
|
||||
is_expected.to contain_vitrage_config('service_credentials/user_domain_id').with_value('default')
|
||||
|
Loading…
Reference in New Issue
Block a user