stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge "identity: enable service validation"

Browse Source
This commit is contained in:
Jenkins
2014-12-09 14:50:17 +00:00
committed by Gerrit Code Review
parent 6d6b3d917e 946b65a691
commit 556b1ab4cf
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/identity.pp
View File

@@ -546,7 +546,8 @@ class cloud::identity (
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}/", 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}/" public_endpoint => "${ks_keystone_public_proto}://${ks_keystone_public_host}:${ks_keystone_public_port}/",
validate_service => true,
} }
keystone_config { keystone_config {

1
spec/classes/cloud_identity_spec.rb
View File

@@ -138,6 +138,7 @@ describe 'cloud::identity' do
:admin_endpoint => 'https://10.0.0.1:35357/', :admin_endpoint => 'https://10.0.0.1:35357/',
:public_endpoint => 'https://10.0.0.1:5000/' :public_endpoint => 'https://10.0.0.1:5000/'
) )
is_expected.to contain_exec('validate_keystone_connection')
is_expected.to contain_keystone_config('ec2/driver').with('value' => 'keystone.contrib.ec2.backends.sql.Ec2') 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') is_expected.to contain_keystone_config('DEFAULT/log_file').with_ensure('absent')
is_expected.to contain_keystone_config('DEFAULT/log_dir').with_ensure('absent') is_expected.to contain_keystone_config('DEFAULT/log_dir').with_ensure('absent')