opendev/system-config
Code Issues Proposed changes

fix er_run commands

Browse Source 
puppet exec doesn't run under a real shell, so running cd doesn't
work because it's not a command. Instead use cwd properly to
actually run these commands.

Also actually call the correct command to generate the uncategorized
jobs page.

Change-Id: I84ed19bbdc16d185316e3967efbd798e06a521d1
This commit is contained in:
Sean Dague 2014-01-23 16:33:39 -05:00
parent 74c68501bc
commit a2f54a86bc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/elastic_recheck/manifests/cron.pp
View File

@ -26,7 +26,7 @@ class elastic_recheck::cron () {
user => 'recheck', user => 'recheck',
minute => '*/15', minute => '*/15',
hour => '*', hour => '*',
command => "cd ${er_state_path}; er_safe_run.sh ${graph_cmd}", command => "cd ${er_state_path} && er_safe_run.sh ${graph_cmd}",
environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin', environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin',
require => Class['elastic_recheck'] require => Class['elastic_recheck']
} }
@ -35,7 +35,7 @@ class elastic_recheck::cron () {
user => 'recheck', user => 'recheck',
minute => '59', minute => '59',
hour => '*', hour => '*',
command => "cd ${er_state_path}; er_safe_run.sh ${graph_cmd}", command => "cd ${er_state_path} && er_safe_run.sh ${uncat_cmd}",
environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin', environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin',
require => Class['elastic_recheck'] require => Class['elastic_recheck']
} }

6
modules/elastic_recheck/manifests/init.pp
View File

@ -46,8 +46,9 @@ class elastic_recheck (
} }
exec { 'run_er_graph': exec { 'run_er_graph':
command => "cd ${recheck_state_dir} && er_safe_run.sh ${graph_cmd}", command => "er_safe_run.sh ${graph_cmd}",
path => '/usr/local/bin:/usr/bin:/bin/', path => '/usr/local/bin:/usr/bin:/bin/',
cwd => $recheck_state_dir,
user => 'recheck', user => 'recheck',
refreshonly => true, refreshonly => true,
require => File['/usr/local/bin/er_safe_run.sh'], require => File['/usr/local/bin/er_safe_run.sh'],
@ -55,8 +56,9 @@ class elastic_recheck (
} }
exec { 'run_er_uncat': exec { 'run_er_uncat':
command => "cd ${recheck_state_dir} && er_safe_run.sh ${uncat_cmd}", command => "er_safe_run.sh ${uncat_cmd}",
path => '/usr/local/bin:/usr/bin:/bin/', path => '/usr/local/bin:/usr/bin:/bin/',
cwd => $recheck_state_dir,
user => 'recheck', user => 'recheck',
refreshonly => true, refreshonly => true,
require => File['/usr/local/bin/er_safe_run.sh'], require => File['/usr/local/bin/er_safe_run.sh'],