From ecab1f6e23a03a3e787e764a858762d5d5d7228c Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 23 Jul 2011 15:40:44 -0400
Subject: [PATCH] Need proper paths for apt-get build-dep to work.

Change-Id: Ib8211facc9d7cc248b97f3be85179157b2e31112
---
 modules/apt/manifests/builddep.pp              | 2 +-
 modules/apt/manifests/ppa.pp                   | 4 ++--
 modules/jenkins_slave/manifests/slavecirepo.pp | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/apt/manifests/builddep.pp b/modules/apt/manifests/builddep.pp
index 3e546a55c6..2c6e19ebe6 100644
--- a/modules/apt/manifests/builddep.pp
+++ b/modules/apt/manifests/builddep.pp
@@ -2,7 +2,7 @@ define apt::builddep($ensure = present) {
   case $ensure {
     present: {
       exec { "Install build-deps for $name":
-        path        => "/bin:/usr/bin",
+        path        => "/usr/sbin:/usr/bin:/sbin:/bin",
         environment => "HOME=/root",
         command     => "apt-get -y --force-yes build-dep $name",
         user        => "root",
diff --git a/modules/apt/manifests/ppa.pp b/modules/apt/manifests/ppa.pp
index aaa8431bfb..be51a062da 100644
--- a/modules/apt/manifests/ppa.pp
+++ b/modules/apt/manifests/ppa.pp
@@ -2,7 +2,7 @@ define apt::ppa($ensure = present) {
   case $ensure {
     present: {
       exec { "Add $name PPA":
-        path        => "/bin:/usr/bin",
+        path        => "/usr/sbin:/usr/bin:/sbin:/bin",
         environment => "HOME=/root",
         command     => "add-apt-repository $name ; apt-get update",
         user        => "root",
@@ -12,7 +12,7 @@ define apt::ppa($ensure = present) {
     }
     absent:  {
       exec { "Add $name PPA":
-        path        => "/bin:/usr/bin",
+        path        => "/usr/sbin:/usr/bin:/sbin:/bin",
         environment => "HOME=/root",
         command     => "add-apt-repository --remove $name ; apt-get update",
         user        => "root",
diff --git a/modules/jenkins_slave/manifests/slavecirepo.pp b/modules/jenkins_slave/manifests/slavecirepo.pp
index 47120b654d..3dbdad54f4 100644
--- a/modules/jenkins_slave/manifests/slavecirepo.pp
+++ b/modules/jenkins_slave/manifests/slavecirepo.pp
@@ -3,7 +3,7 @@ define slavecirepo($ensure = present) {
   case $ensure {
     present: {
       exec { "Clone openstack-ci git repo":
-        path        => "/bin:/usr/bin",
+        path        => "/usr/sbin:/usr/bin:/sbin:/bin",
         environment => "HOME=/home/jenkins",
         command     => "sudo -H -u jenkins -i git clone git://github.com/openstack/openstack-ci.git /home/jenkins/openstack-ci",
         user        => "root",
@@ -12,7 +12,7 @@ define slavecirepo($ensure = present) {
         logoutput   => on_failure,
       }
       exec { "Update openstack-ci git repo":
-        path        => "/bin:/usr/bin",
+        path        => "/usr/sbin:/usr/bin:/sbin:/bin",
         environment => "HOME=/home/jenkins",
         command     => "sudo -H -u jenkins -i bash -c 'cd /home/jenkins/openstack-ci && git pull'",
         user        => "root",
@@ -23,7 +23,7 @@ define slavecirepo($ensure = present) {
     }
     absent:  {
       exec { "Remove OpenStack git repo":
-        path    => "/bin:/usr/bin",
+        path    => "/usr/sbin:/usr/bin:/sbin:/bin",
         environment => "HOME=/root",
         command => "rm -rf /home/jenkins/openstack-ci",
         user    => "root",