stackforge/puppet-openstack-cloud
Code Issues Proposed changes

identity: don't validate Keystone service

Browse Source 
The exec is broken so we need to disable it to save time during the
deployment.

Change-Id: Ia57438e0c88609e70860179f16bb457290eac5ab
This commit is contained in:
Emilien Macchi
2015-05-12 19:57:58 -04:00
parent 862d049985
commit 25b6b07399
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/identity.pp
View File

@@ -557,7 +557,6 @@ class cloud::identity (
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

@@ -141,7 +141,6 @@ 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')