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.

(cherry picked from commit e6c191194312935ea01c97ae667bf3ea1a912f81)

Conflicts:
	spec/classes/ceilometer_db_spec.rb

Change-Id: I888be405f418932c0e46ce8e82486755d36fc7bf

diff --git a/manifests/db.pp b/manifests/db.pp
index 1cf955aea0033b105aaba9b86bb78989f0f9f8c0..15822d8ce95f218ee805b3e7ed4df3f023506ef9 100644 (file)
--- 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 04b15e902858cf41eb94e9718dfb24e8e6d88b84..b66f01fed6298bf19b82a50e31c1cbd2c105f8aa 100644 (file)
--- 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 aa3610010f91447c05049ce5201d118bb525d15b..0dc88dcd330f9ec2f650f62b667c5c81a3d32a6e 100644 (file)
--- 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