From 35543bac12993049572a4ce25b586771a4666d52 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 7 Oct 2014 16:05:46 -0400 Subject: [PATCH] identity: configure public_endpoint in key-config Add public_endpoint paramter is Keystone configuration. Closes #662 --- manifests/identity.pp | 3 ++- spec/classes/cloud_identity_spec.rb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/manifests/identity.pp b/manifests/identity.pp index 1064df47..acd7f392 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -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 { diff --git a/spec/classes/cloud_identity_spec.rb b/spec/classes/cloud_identity_spec.rb index 5c464019..6ed6736e 100644 --- a/spec/classes/cloud_identity_spec.rb +++ b/spec/classes/cloud_identity_spec.rb @@ -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')