Correct cafile directive for service_credentials

Running with my own ROOT CA, it appears that the correct directive
is cafile, and not ca_file. Changing for the correct option made
certificate validation work for me, when it didn't previously.

Change-Id: Iff7575c1c0269788a908ff9db258a76d21f2da1b

diff --git a/manifests/agent/auth.pp b/manifests/agent/auth.pp
index 14083fd1d24a6f8ee0c9c1e177d3b0f41ca5f1e3..628a1447d67c952379b40357e6a8e928a0e55931 100644 (file)
--- a/manifests/agent/auth.pp
+++ b/manifests/agent/auth.pp
@@ -66,9 +66,9 @@ class ceilometer::agent::auth (
   include ::ceilometer::deps
 
   if ! $auth_cacert {
-    ceilometer_config { 'service_credentials/ca_file': ensure => absent }
+    ceilometer_config { 'service_credentials/cafile': ensure => absent }
   } else {
-    ceilometer_config { 'service_credentials/ca_file': value => $auth_cacert }
+    ceilometer_config { 'service_credentials/cafile': value => $auth_cacert }
   }
 
   ceilometer_config {

diff --git a/spec/classes/ceilometer_agent_auth_spec.rb b/spec/classes/ceilometer_agent_auth_spec.rb
index 97dc0d6d9e9f83bdf912004c06dd8b068ed17937..71ccaecaa1a73229f08a2b0e27c8828f46e237b0 100644 (file)
--- a/spec/classes/ceilometer_agent_auth_spec.rb
+++ b/spec/classes/ceilometer_agent_auth_spec.rb
@@ -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(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/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/project_domain_name').with_value('Default')
       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',
         )
       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/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]) }