stackforge/puppet-openstack-cloud
Code Issues Proposed changes

identity: don't specify API version in {public,admin}_endpoint

Browse Source 
{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:
<link href="https://os-ci-vip.ring.enovance.com:5000/v2.0/v2.0/" rel="self"/>
This commit is contained in:
Emilien Macchi 2014-11-12 11:02:41 +01:00
parent 3669030752
commit 3a318c53ac
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/identity.pp
View File

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

4
spec/classes/cloud_identity_spec.rb
View File

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