opendev/system-config
Code Issues Proposed changes

Need proper paths for apt-get build-dep to work.

Browse Source 
Change-Id: Ib8211facc9d7cc248b97f3be85179157b2e31112
This commit is contained in:
Monty Taylor 2011-07-23 15:40:44 -04:00
parent 0a984ea78b
commit ecab1f6e23
3 changed files with 6 additions and 6 deletions
modules
apt/manifests
builddep.ppppa.pp
jenkins_slave/manifests
slavecirepo.pp

2
modules/apt/manifests/builddep.pp

@ -2,7 +2,7 @@ define apt::builddep($ensure = present) {
case $ensure { case $ensure {
present: { present: {
exec { "Install build-deps for $name": exec { "Install build-deps for $name":
path => "/bin:/usr/bin", path => "/usr/sbin:/usr/bin:/sbin:/bin",
environment => "HOME=/root", environment => "HOME=/root",
command => "apt-get -y --force-yes build-dep $name", command => "apt-get -y --force-yes build-dep $name",
user => "root", user => "root",

4
modules/apt/manifests/ppa.pp

@ -2,7 +2,7 @@ define apt::ppa($ensure = present) {
case $ensure { case $ensure {
present: { present: {
exec { "Add $name PPA": exec { "Add $name PPA":
path => "/bin:/usr/bin", path => "/usr/sbin:/usr/bin:/sbin:/bin",
environment => "HOME=/root", environment => "HOME=/root",
command => "add-apt-repository $name ; apt-get update", command => "add-apt-repository $name ; apt-get update",
user => "root", user => "root",
@ -12,7 +12,7 @@ define apt::ppa($ensure = present) {
} }
absent: { absent: {
exec { "Add $name PPA": exec { "Add $name PPA":
path => "/bin:/usr/bin", path => "/usr/sbin:/usr/bin:/sbin:/bin",
environment => "HOME=/root", environment => "HOME=/root",
command => "add-apt-repository --remove $name ; apt-get update", command => "add-apt-repository --remove $name ; apt-get update",
user => "root", user => "root",

6
modules/jenkins_slave/manifests/slavecirepo.pp

@ -3,7 +3,7 @@ define slavecirepo($ensure = present) {
case $ensure { case $ensure {
present: { present: {
exec { "Clone openstack-ci git repo": exec { "Clone openstack-ci git repo":
path => "/bin:/usr/bin", path => "/usr/sbin:/usr/bin:/sbin:/bin",
environment => "HOME=/home/jenkins", environment => "HOME=/home/jenkins",
command => "sudo -H -u jenkins -i git clone git://github.com/openstack/openstack-ci.git /home/jenkins/openstack-ci", command => "sudo -H -u jenkins -i git clone git://github.com/openstack/openstack-ci.git /home/jenkins/openstack-ci",
user => "root", user => "root",
@ -12,7 +12,7 @@ define slavecirepo($ensure = present) {
logoutput => on_failure, logoutput => on_failure,
} }
exec { "Update openstack-ci git repo": exec { "Update openstack-ci git repo":
path => "/bin:/usr/bin", path => "/usr/sbin:/usr/bin:/sbin:/bin",
environment => "HOME=/home/jenkins", environment => "HOME=/home/jenkins",
command => "sudo -H -u jenkins -i bash -c 'cd /home/jenkins/openstack-ci && git pull'", command => "sudo -H -u jenkins -i bash -c 'cd /home/jenkins/openstack-ci && git pull'",
user => "root", user => "root",
@ -23,7 +23,7 @@ define slavecirepo($ensure = present) {
} }
absent: { absent: {
exec { "Remove OpenStack git repo": exec { "Remove OpenStack git repo":
path => "/bin:/usr/bin", path => "/usr/sbin:/usr/bin:/sbin:/bin",
environment => "HOME=/root", environment => "HOME=/root",
command => "rm -rf /home/jenkins/openstack-ci", command => "rm -rf /home/jenkins/openstack-ci",
user => "root", user => "root",