From db57161a47b900edf39fe508249f9fc876d3ed55 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 4 Jul 2014 14:16:56 -0700 Subject: [PATCH] Fix run puppet cronjob. ansible-playbook is in /usr/local, but that's not in the cron job path. Also, although there is an ansible log setting in ansible.cfg, the ansible-playbook command still outputs stuff. We don't want cronspam, so add the redirection to the log file back in. Change-Id: Id585c11cca4cbd7e1ba26adbfbe22af650ca2b50 --- modules/openstack_project/manifests/puppetmaster.pp | 2 +- run_all.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp index 8459fd585d..3a891397dd 100644 --- a/modules/openstack_project/manifests/puppetmaster.pp +++ b/modules/openstack_project/manifests/puppetmaster.pp @@ -49,7 +49,7 @@ class openstack_project::puppetmaster ( user => 'root', minute => '*/15', command => $cron_command, - environment => 'PATH=/var/lib/gems/1.8/bin:/usr/bin:/bin:/usr/sbin:/sbin', + environment => 'PATH=/var/lib/gems/1.8/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin', } cron { 'deleteoldreports': diff --git a/run_all.sh b/run_all.sh index 8fa47d6094..e251984b72 100755 --- a/run_all.sh +++ b/run_all.sh @@ -24,4 +24,4 @@ git fetch -a && git reset -q --hard @{u} touch manifests/site.pp # Run this as an external script so that the above pull will get new changes -ansible-playbook -v /etc/ansible/remote_puppet.yaml +ansible-playbook -v /etc/ansible/remote_puppet.yaml >> /var/log/puppet_run_all.log 2>&1