From 893a54e98430b93cc71524ea1df0fc1227d7d098 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Thu, 19 Oct 2017 14:03:10 +0800 Subject: [PATCH] Switch to use keystone v3 Keystone v2 api's are removed in [1], so it's required to use keystone v3 otherwise all requests fallbacks to keystone v2.0 and fails. [1] https://review.openstack.org/#/c/499783/ Change-Id: Ie2794d5fb12785e7c620c4ec8e3ccc2fb64d9e3b Closes-Bug: #1723838 --- manifests/auth.pp | 2 +- spec/acceptance/aodh_wsgi_apache_spec.rb | 2 +- spec/classes/aodh_auth_spec.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/auth.pp b/manifests/auth.pp index e8019703..62683b44 100644 --- a/manifests/auth.pp +++ b/manifests/auth.pp @@ -49,7 +49,7 @@ # class aodh::auth ( $auth_password, - $auth_url = 'http://localhost:5000/v2.0', + $auth_url = 'http://localhost:5000/v3', $auth_region = 'RegionOne', $auth_user = 'aodh', $auth_tenant_name = 'services', diff --git a/spec/acceptance/aodh_wsgi_apache_spec.rb b/spec/acceptance/aodh_wsgi_apache_spec.rb index a8e6aca8..ef3b3564 100644 --- a/spec/acceptance/aodh_wsgi_apache_spec.rb +++ b/spec/acceptance/aodh_wsgi_apache_spec.rb @@ -51,7 +51,7 @@ describe 'basic aodh' do ssl => false, } class { '::aodh::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 { '::aodh::client': } diff --git a/spec/classes/aodh_auth_spec.rb b/spec/classes/aodh_auth_spec.rb index 0a5d4561..4ef2d3fa 100644 --- a/spec/classes/aodh_auth_spec.rb +++ b/spec/classes/aodh_auth_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe 'aodh::auth' do let :params do - { :auth_url => 'http://localhost:5000/v2.0', + { :auth_url => 'http://localhost:5000/v3', :auth_region => 'RegionOne', :auth_user => 'aodh', :auth_password => 'password', @@ -14,7 +14,7 @@ describe 'aodh::auth' do shared_examples_for 'aodh-auth' do it 'configures authentication' do - is_expected.to contain_aodh_config('service_credentials/auth_url').with_value('http://localhost:5000/v2.0') + is_expected.to contain_aodh_config('service_credentials/auth_url').with_value('http://localhost:5000/v3') is_expected.to contain_aodh_config('service_credentials/region_name').with_value('RegionOne') is_expected.to contain_aodh_config('service_credentials/project_domain_id').with_value('default') is_expected.to contain_aodh_config('service_credentials/user_domain_id').with_value('default')