crontab: ensure the script is run with bash shell

Some distros does not provide a default shell for Keystone user. We can run the crontab by force shell usage and avoid running issues. Change-Id: Ib05522d922fecfbd28aa8a8b092b4d3b47172d00
strider · Dec 9, 2014 · c39fca2 · c39fca2
1 parent 0df9701
commit c39fca2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/manifests/cron/token_flush.pp b/manifests/cron/token_flush.pp
@@ -64,7 +64,7 @@
   cron { 'keystone-manage token_flush':
     ensure      => $ensure,
     command     => "${sleep}keystone-manage token_flush >>/var/log/keystone/keystone-tokenflush.log 2>&1",
-    environment => 'PATH=/bin:/usr/bin:/usr/sbin',
+    environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
     user        => 'keystone',
     minute      => $minute,
     hour        => $hour,

diff --git a/spec/classes/keystone_cron_token_flush_spec.rb b/spec/classes/keystone_cron_token_flush_spec.rb
@@ -11,7 +11,7 @@
       should contain_cron('keystone-manage token_flush').with(
         :ensure      => 'present',
         :command     => 'keystone-manage token_flush >>/var/log/keystone/keystone-tokenflush.log 2>&1',
-        :environment => 'PATH=/bin:/usr/bin:/usr/sbin',
+        :environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
         :user        => 'keystone',
         :minute      => 1,
         :hour        => 0,
@@ -33,7 +33,7 @@
       should contain_cron('keystone-manage token_flush').with(
         :ensure      => 'present',
         :command     => 'sleep `expr ${RANDOM} \\% 600`; keystone-manage token_flush >>/var/log/keystone/keystone-tokenflush.log 2>&1',
-        :environment => 'PATH=/bin:/usr/bin:/usr/sbin',
+        :environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
         :user        => 'keystone',
         :minute      => 1,
         :hour        => 0,
@@ -55,7 +55,7 @@
       should contain_cron('keystone-manage token_flush').with(
         :ensure      => 'absent',
         :command     => 'keystone-manage token_flush >>/var/log/keystone/keystone-tokenflush.log 2>&1',
-        :environment => 'PATH=/bin:/usr/bin:/usr/sbin',
+        :environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
         :user        => 'keystone',
         :minute      => 1,
         :hour        => 0,