stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #519 from enovance/admin-endpoint

Browse Source 
identity: configure admin_endpoint URL
This commit is contained in:
Sebastien Badia
2014-06-25 10:25:48 +02:00
parent 4bf501856e b36d44b088
commit 49a08614d8
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

@@ -437,7 +437,8 @@ class cloud::identity (
public_port => $ks_keystone_public_port, public_port => $ks_keystone_public_port,
admin_port => $ks_keystone_admin_port, admin_port => $ks_keystone_admin_port,
token_driver => $token_driver, 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 { keystone_config {

3
spec/classes/cloud_identity_spec.rb
View File

@@ -126,7 +126,8 @@ describe 'cloud::identity' do
:admin_port => '35357', :admin_port => '35357',
:token_expiration => '3600', :token_expiration => '3600',
:log_dir => false, :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('ec2/driver').with('value' => 'keystone.contrib.ec2.backends.sql.Ec2')
should contain_keystone_config('DEFAULT/log_file').with_ensure('absent') should contain_keystone_config('DEFAULT/log_file').with_ensure('absent')