From: Yanis Guenane <yanis.guenane@enovance.com>
Date: Thu, 20 Feb 2014 14:55:13 +0000 (-0500)
Subject: Define $user referenced in db.pp
X-Git-Tag: 4.0.0~16
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e6c191194312935ea01c97ae667bf3ea1a912f81;p=puppet-modules%2Fpuppet-ceilometer.git

Define $user referenced in db.pp

In db.pp, in the exec 'ceilometer dbsync' ressource the user
is supposed to be $::ceilometer::params::user, but it was
not defined.

Change-Id: I812b6ba2877faddfce86d3c97b95772b0d22d368
---

diff --git a/manifests/db.pp b/manifests/db.pp
index 1cf955a..15822d8 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -62,7 +62,7 @@ class ceilometer::db (
   exec { 'ceilometer-dbsync':
     command     => $command,
     path        => '/usr/bin',
-    user        => $::ceilometer::params::username,
+    user        => $::ceilometer::params::user,
     refreshonly => true,
     logoutput   => on_failure,
     subscribe   => Ceilometer_config['database/connection']
diff --git a/manifests/params.pp b/manifests/params.pp
index c240bb9..89281be 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,6 +4,7 @@ class ceilometer::params {
 
   $dbsync_command  = 'ceilometer-dbsync --config-file=/etc/ceilometer/ceilometer.conf'
   $expirer_command = 'ceilometer-expirer'
+  $user            = 'ceilometer'
 
   case $::osfamily {
     'RedHat': {
diff --git a/spec/classes/ceilometer_db_spec.rb b/spec/classes/ceilometer_db_spec.rb
index aa36100..0dc88dc 100644
--- a/spec/classes/ceilometer_db_spec.rb
+++ b/spec/classes/ceilometer_db_spec.rb
@@ -27,6 +27,7 @@ describe 'ceilometer::db' do
         :command     => 'ceilometer-dbsync --config-file=/etc/ceilometer/ceilometer.conf',
         :path        => '/usr/bin',
         :refreshonly => 'true',
+        :user        => 'ceilometer',
         :logoutput   => 'on_failure'
       )
     end
@@ -60,6 +61,7 @@ describe 'ceilometer::db' do
         :command     => '/bin/true',
         :path        => '/usr/bin',
         :refreshonly => 'true',
+        :user        => 'ceilometer',
         :logoutput   => 'on_failure'
       )
     end
@@ -92,6 +94,7 @@ describe 'ceilometer::db' do
         :command     => 'ceilometer-dbsync --config-file=/etc/ceilometer/ceilometer.conf',
         :path        => '/usr/bin',
         :refreshonly => 'true',
+        :user        => 'ceilometer',
         :logoutput   => 'on_failure'
       )
     end
@@ -125,6 +128,7 @@ describe 'ceilometer::db' do
         :command     => '/bin/true',
         :path        => '/usr/bin',
         :refreshonly => 'true',
+        :user        => 'ceilometer',
         :logoutput   => 'on_failure'
       )
     end
@@ -154,6 +158,7 @@ describe 'ceilometer::db' do
         :command     => 'ceilometer-dbsync --config-file=/etc/ceilometer/ceilometer.conf',
         :path        => '/usr/bin',
         :refreshonly => 'true',
+        :user        => 'ceilometer',
         :logoutput   => 'on_failure'
       )
     end