From 3a318c53acdc9e28381cfc8512930f077bfc9e0a Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 12 Nov 2014 11:02:41 +0100 Subject: [PATCH] identity: don't specify API version in {public,admin}_endpoint {public,admin}_endpoint parameters are used for service discovery in Keystone API. They should not contain the API version otherwise that would lead to an URL like this: --- manifests/identity.pp | 4 ++-- spec/classes/cloud_identity_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/identity.pp b/manifests/identity.pp index acd7f392..df1bbb7b 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -490,8 +490,8 @@ class cloud::identity ( admin_port => $ks_keystone_admin_port, token_driver => $token_driver, token_expiration => $ks_token_expiration, - admin_endpoint => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/v2.0", - public_endpoint => "${ks_keystone_public_proto}://${ks_keystone_public_host}:${ks_keystone_public_port}/v2.0" + admin_endpoint => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/", + public_endpoint => "${ks_keystone_public_proto}://${ks_keystone_public_host}:${ks_keystone_public_port}/" } keystone_config { diff --git a/spec/classes/cloud_identity_spec.rb b/spec/classes/cloud_identity_spec.rb index 6ed6736e..378f7d1e 100644 --- a/spec/classes/cloud_identity_spec.rb +++ b/spec/classes/cloud_identity_spec.rb @@ -135,8 +135,8 @@ describe 'cloud::identity' do :token_expiration => '3600', :log_dir => false, :log_file => false, - :admin_endpoint => 'https://10.0.0.1:35357/v2.0', - :public_endpoint => 'https://10.0.0.1:5000/v2.0' + :admin_endpoint => 'https://10.0.0.1:35357/', + :public_endpoint => 'https://10.0.0.1:5000/' ) is_expected.to contain_keystone_config('ec2/driver').with('value' => 'keystone.contrib.ec2.backends.sql.Ec2') is_expected.to contain_keystone_config('DEFAULT/log_file').with_ensure('absent')