From 25b6b07399d2bf56640d06b3b0718cf7425f93de Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 12 May 2015 19:57:58 -0400 Subject: [PATCH] identity: don't validate Keystone service The exec is broken so we need to disable it to save time during the deployment. Change-Id: Ia57438e0c88609e70860179f16bb457290eac5ab --- manifests/identity.pp | 1 - spec/classes/cloud_identity_spec.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/manifests/identity.pp b/manifests/identity.pp index f5be1e38..c091e042 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -557,7 +557,6 @@ class cloud::identity ( token_expiration => $ks_token_expiration, 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}/", - validate_service => true, } keystone_config { diff --git a/spec/classes/cloud_identity_spec.rb b/spec/classes/cloud_identity_spec.rb index 1f7dcee9..f846c404 100644 --- a/spec/classes/cloud_identity_spec.rb +++ b/spec/classes/cloud_identity_spec.rb @@ -141,7 +141,6 @@ describe 'cloud::identity' do :admin_endpoint => 'https://10.0.0.1:35357/', :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('DEFAULT/log_file').with_ensure('absent') is_expected.to contain_keystone_config('DEFAULT/log_dir').with_ensure('absent')