crontab: ensure the script is run with shell

Some distros does not provide a default shell for Ceilometer user.
We can run the crontab by force shell usage and avoid running
issues.

Closes-bug: #1400523
Change-Id: I3a4d5c958a4620335d062baecfc362fd758768b6
(cherry picked from commit a83673c3bae7d560680cb77f2a2cc8c998fac2b7)

diff --git a/manifests/expirer.pp b/manifests/expirer.pp
index 597b09cb4f5a598b34a3a41fc54cc16c6190e12e..07a16fb7a37a9989d981513879a02e0011635b87 100644 (file)
--- a/manifests/expirer.pp
+++ b/manifests/expirer.pp
@@ -61,7 +61,7 @@ class ceilometer::expirer (
 
   cron { 'ceilometer-expirer':
     command     => $ceilometer::params::expirer_command,
-    environment => 'PATH=/bin:/usr/bin:/usr/sbin',
+    environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
     user        => 'ceilometer',
     minute      => $minute,
     hour        => $hour,

diff --git a/spec/classes/ceilometer_expirer_spec.rb b/spec/classes/ceilometer_expirer_spec.rb
index 08d62fd38c628f4f1cc5ea5f9301a37e6eab41c5..945c9f12225aafae5b263d4674190f8975a02480 100644 (file)
--- a/spec/classes/ceilometer_expirer_spec.rb
+++ b/spec/classes/ceilometer_expirer_spec.rb
@@ -44,7 +44,7 @@ describe 'ceilometer::expirer' do
     it 'configures a cron' do
       should contain_cron('ceilometer-expirer').with(
         :command     => 'ceilometer-expirer',
-        :environment => 'PATH=/bin:/usr/bin:/usr/sbin',
+        :environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
         :user        => 'ceilometer',
         :minute      => 1,
         :hour        => 0,