From b36d44b0887c68afb171c96c7a1b09cad23bef7a Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 25 Jun 2014 10:09:57 +0200 Subject: [PATCH] identity: configure admin_endpoint URL puppet-keystone use admin_endpoint in keystone.conf for getting a token with a provider. If the flag is not set, it will use HTTP and we need to be able to dynamically configure this flag to allow using HTTPS. Signed-off-by: Emilien Macchi --- 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 f6f26da8..88a638fe 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -437,7 +437,8 @@ class cloud::identity ( public_port => $ks_keystone_public_port, admin_port => $ks_keystone_admin_port, token_driver => $token_driver, - token_expiration => $ks_token_expiration + token_expiration => $ks_token_expiration, + admin_endpoint => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/v2.0" } keystone_config { diff --git a/spec/classes/cloud_identity_spec.rb b/spec/classes/cloud_identity_spec.rb index 45d6fe40..5ffddf39 100644 --- a/spec/classes/cloud_identity_spec.rb +++ b/spec/classes/cloud_identity_spec.rb @@ -126,7 +126,8 @@ describe 'cloud::identity' do :admin_port => '35357', :token_expiration => '3600', :log_dir => false, - :log_file => false + :log_file => false, + :admin_endpoint => 'https://10.0.0.1:35357/v2.0' ) should contain_keystone_config('ec2/driver').with('value' => 'keystone.contrib.ec2.backends.sql.Ec2') should contain_keystone_config('DEFAULT/log_file').with_ensure('absent')