stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #663 from enovance/fix-pub-endpoint

Browse Source 
identity: configure public_endpoint in key-config
This commit is contained in:
Yanis Guenane
2014-10-07 22:35:50 -04:00
parent e2899f5796 35543bac12
commit 51fad62bd8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/identity.pp
View File

@@ -490,7 +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"
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"
}
keystone_config {

3
spec/classes/cloud_identity_spec.rb
View File

@@ -135,7 +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'
:admin_endpoint => 'https://10.0.0.1:35357/v2.0',
:public_endpoint => 'https://10.0.0.1:5000/v2.0'
)
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')