openstack/puppet-ceilometer
Code Issues Proposed changes

Merge "Correct cafile directive for service_credentials"

Browse Source
This commit is contained in:
Zuul 2019-03-25 14:15:05 +00:00 committed by Gerrit Code Review
commit 91e1a08651
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/agent/auth.pp
View File

@ -66,9 +66,9 @@ class ceilometer::agent::auth (
include ::ceilometer::deps include ::ceilometer::deps
if ! $auth_cacert { if ! $auth_cacert {
ceilometer_config { 'service_credentials/ca_file': ensure => absent } ceilometer_config { 'service_credentials/cafile': ensure => absent }
} else { } else {
ceilometer_config { 'service_credentials/ca_file': value => $auth_cacert } ceilometer_config { 'service_credentials/cafile': value => $auth_cacert }
} }
ceilometer_config { ceilometer_config {

4
spec/classes/ceilometer_agent_auth_spec.rb
View File

@ -24,7 +24,7 @@ describe 'ceilometer::agent::auth' do
is_expected.to contain_ceilometer_config('service_credentials/password').with_value('password') is_expected.to contain_ceilometer_config('service_credentials/password').with_value('password')
is_expected.to contain_ceilometer_config('service_credentials/password').with_value(params[:auth_password]).with_secret(true) is_expected.to contain_ceilometer_config('service_credentials/password').with_value(params[:auth_password]).with_secret(true)
is_expected.to contain_ceilometer_config('service_credentials/project_name').with_value('services') is_expected.to contain_ceilometer_config('service_credentials/project_name').with_value('services')
is_expected.to contain_ceilometer_config('service_credentials/ca_file').with(:ensure => 'absent') is_expected.to contain_ceilometer_config('service_credentials/cafile').with(:ensure => 'absent')
is_expected.to contain_ceilometer_config('service_credentials/user_domain_name').with_value('Default') is_expected.to contain_ceilometer_config('service_credentials/user_domain_name').with_value('Default')
is_expected.to contain_ceilometer_config('service_credentials/project_domain_name').with_value('Default') is_expected.to contain_ceilometer_config('service_credentials/project_domain_name').with_value('Default')
is_expected.to contain_ceilometer_config('service_credentials/auth_type').with_value('password') is_expected.to contain_ceilometer_config('service_credentials/auth_type').with_value('password')
@ -40,7 +40,7 @@ describe 'ceilometer::agent::auth' do
:auth_project_domain_name => 'MyProjDomain', :auth_project_domain_name => 'MyProjDomain',
) )
end end
it { is_expected.to contain_ceilometer_config('service_credentials/ca_file').with_value(params[:auth_cacert]) } it { is_expected.to contain_ceilometer_config('service_credentials/cafile').with_value(params[:auth_cacert]) }
it { is_expected.to contain_ceilometer_config('service_credentials/interface').with_value(params[:auth_endpoint_type]) } it { is_expected.to contain_ceilometer_config('service_credentials/interface').with_value(params[:auth_endpoint_type]) }
it { is_expected.to contain_ceilometer_config('service_credentials/user_domain_name').with_value(params[:auth_user_domain_name]) } it { is_expected.to contain_ceilometer_config('service_credentials/user_domain_name').with_value(params[:auth_user_domain_name]) }
it { is_expected.to contain_ceilometer_config('service_credentials/project_domain_name').with_value(params[:auth_project_domain_name]) } it { is_expected.to contain_ceilometer_config('service_credentials/project_domain_name').with_value(params[:auth_project_domain_name]) }