Remove useless params

diff --git a/manifests/init.pp b/manifests/init.pp
index df8591931397caeb3fdba2e62fe2ca59a3d0bb35..f5688af5e3242305731cb18102830806fe9fb995 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,14 +13,18 @@ class ceilometer (
 
   include ceilometer::params
 
+  File {
+    require => Package['ceilometer-common'],
+  }
+
   group { 'ceilometer':
-    name    => $::ceilometer::params::groupname,
+    name    => 'ceilometer',
     require => Package['ceilometer-common'],
   }
 
   user { 'ceilometer':
-    name    => $::ceilometer::params::username,
-    gid     => $::ceilometer::params::groupname,
+    name    => 'ceilometer',
+    gid     => 'ceilometer',
     groups  => ['nova'],
     system  => true,
     require => Package['ceilometer-common'],
@@ -31,11 +35,9 @@ class ceilometer (
     owner   => 'ceilometer',
     group   => 'ceilometer',
     mode    => '0750',
-    require => Package['ceilometer-common'],
   }
 
   file { '/etc/ceilometer/ceilometer.conf':
-    ensure  => file,
     owner   => 'ceilometer',
     group   => 'ceilometer',
     mode    => '0640',

diff --git a/manifests/params.pp b/manifests/params.pp
index 698ffc0d340f0f9725c3b4baa8d42f1e4ffdcb97..916774ee0e8f650b67318301a31393c91769e661 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,10 +1,7 @@
 #
 class ceilometer::params {
 
-  $username       = 'ceilometer'
-  $groupname      = 'ceilometer'
-  $cinder_conf    = '/etc/ceilometer/ceilometer.conf'
-  $dbsync_command = "ceilometer-dbsync --config-file=${cinder_conf}"
+  $dbsync_command = "ceilometer-dbsync --config-file=/etc/ceilometer/ceilometer.conf"
   $log_dir        = '/var/log/ceilometer'
 
   case $::osfamily {

diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index 4968266860e031bfafcc8ed458830ac8f9b13655..6cdf6e4ba6d5956f9c334f96d00e00ebe084bcf3 100644 (file)
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -48,10 +48,10 @@ describe 'ceilometer' do
 
     it 'configures ceilometer configuration file' do
       should contain_file('/etc/ceilometer/ceilometer.conf').with(
-        :ensure  => 'file',
         :owner   => 'ceilometer',
         :group   => 'ceilometer',
-        :mode    => '0640'
+        :mode    => '0640',
+        :require => 'Package[ceilometer-common]'
       )
     end