From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Tue, 9 Dec 2014 15:53:50 +0000 (-0500)
Subject: crontab: ensure the script is run with shell
X-Git-Tag: 5.1.0~12
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=953ce5032cb332bf8a15e78358ee8af6f14dd7f0;p=puppet-modules%2Fpuppet-ceilometer.git

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 597b09c..07a16fb 100644
--- 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 08d62fd..945c9f1 100644
--- 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,