From: Mathieu Gagné <mgagne@iweb.com>
Date: Tue, 4 Mar 2014 21:57:42 +0000 (-0500)
Subject: Move service polling credentials to service_credentials
X-Git-Tag: 3.1.1~3
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3e3c021a81b015323c2fe0243f138f90c2cd2eb7;p=puppet-modules%2Fpuppet-ceilometer.git

Move service polling credentials to service_credentials

Change-Id: I74a523bcc1acd18532bb9353b70da63c70e8e325
Closes-bug: #1287939
(cherry picked from commit 160b5ed239e996e6c18de3f6158c8b0a4e66c175)
---

diff --git a/manifests/agent/auth.pp b/manifests/agent/auth.pp
index 04579c2..9eec3d3 100644
--- a/manifests/agent/auth.pp
+++ b/manifests/agent/auth.pp
@@ -40,22 +40,22 @@ class ceilometer::agent::auth (
 ) {
 
   if ! $auth_cacert {
-    ceilometer_config { 'DEFAULT/os_cacert': ensure => absent }
+    ceilometer_config { 'service_credentials/os_cacert': ensure => absent }
   } else {
-    ceilometer_config { 'DEFAULT/os_cacert': value => $auth_cacert }
+    ceilometer_config { 'service_credentials/os_cacert': value => $auth_cacert }
   }
 
   ceilometer_config {
-    'DEFAULT/os_auth_url'         : value => $auth_url;
-    'DEFAULT/os_auth_region'      : value => $auth_region;
-    'DEFAULT/os_username'         : value => $auth_user;
-    'DEFAULT/os_password'         : value => $auth_password;
-    'DEFAULT/os_tenant_name'      : value => $auth_tenant_name;
+    'service_credentials/os_auth_url'    : value => $auth_url;
+    'service_credentials/os_auth_region' : value => $auth_region;
+    'service_credentials/os_username'    : value => $auth_user;
+    'service_credentials/os_password'    : value => $auth_password;
+    'service_credentials/os_tenant_name' : value => $auth_tenant_name;
   }
 
   if ($auth_tenant_id != '') {
     ceilometer_config {
-      'DEFAULT/os_tenant_id'        : value => $auth_tenant_id;
+      'service_credentials/os_tenant_id' : value => $auth_tenant_id;
     }
   }
 
diff --git a/spec/classes/ceilometer_agent_auth_spec.rb b/spec/classes/ceilometer_agent_auth_spec.rb
index bf8feb7..ec3b582 100644
--- a/spec/classes/ceilometer_agent_auth_spec.rb
+++ b/spec/classes/ceilometer_agent_auth_spec.rb
@@ -19,19 +19,19 @@ describe 'ceilometer::agent::auth' do
   shared_examples_for 'ceilometer-agent-auth' do
 
     it 'configures authentication' do
-      should contain_ceilometer_config('DEFAULT/os_auth_url').with_value('http://localhost:5000/v2.0')
-      should contain_ceilometer_config('DEFAULT/os_auth_region').with_value('RegionOne')
-      should contain_ceilometer_config('DEFAULT/os_username').with_value('ceilometer')
-      should contain_ceilometer_config('DEFAULT/os_password').with_value('password')
-      should contain_ceilometer_config('DEFAULT/os_tenant_name').with_value('services')
-      should contain_ceilometer_config('DEFAULT/os_cacert').with(:ensure => 'absent')
+      should contain_ceilometer_config('service_credentials/os_auth_url').with_value('http://localhost:5000/v2.0')
+      should contain_ceilometer_config('service_credentials/os_auth_region').with_value('RegionOne')
+      should contain_ceilometer_config('service_credentials/os_username').with_value('ceilometer')
+      should contain_ceilometer_config('service_credentials/os_password').with_value('password')
+      should contain_ceilometer_config('service_credentials/os_tenant_name').with_value('services')
+      should contain_ceilometer_config('service_credentials/os_cacert').with(:ensure => 'absent')
     end
 
     context 'when overriding parameters' do
       before do
         params.merge!(:auth_cacert => '/tmp/dummy.pem')
       end
-      it { should contain_ceilometer_config('DEFAULT/os_cacert').with_value(params[:auth_cacert]) }
+      it { should contain_ceilometer_config('service_credentials/os_cacert').with_value(params[:auth_cacert]) }
     end
 
   end