From c39fca28e68cbfdcfb64efb91ec9927a9385cdd3 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 9 Dec 2014 10:50:06 -0500 Subject: [PATCH] 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 --- manifests/cron/token_flush.pp | 2 +- spec/classes/keystone_cron_token_flush_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/cron/token_flush.pp b/manifests/cron/token_flush.pp index 177bbe77f..331eeba56 100644 --- a/manifests/cron/token_flush.pp +++ b/manifests/cron/token_flush.pp @@ -64,7 +64,7 @@ class keystone::cron::token_flush ( 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 index 16f3bbe33..597042b36 100644 --- a/spec/classes/keystone_cron_token_flush_spec.rb +++ b/spec/classes/keystone_cron_token_flush_spec.rb @@ -11,7 +11,7 @@ describe 'keystone::cron::token_flush' do 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 @@ describe 'keystone::cron::token_flush' do 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 @@ describe 'keystone::cron::token_flush' do 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,