From 25c8b4804d15135b9366844293571cfbf86a48c2 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 11 Oct 2012 15:18:03 -0700 Subject: [PATCH] Fix a dependency issues in jenkins::master. /var/lib/jenkins/plugins/simple-theme-plugin did not depend on /var/lib/jenkins/plugins being in place before it tried to do its thing. This resulted in failure. Add file resources for /var/lib/jenkins and /var/lib/jenkins/plugins and instert the appropriate requirements. Note that the group for /var/lib/jenkins/plugins is nogroup on jenkins-dev and the unnamed group 118 on jenkins.o.o. This change will make the group nogroup on both hosts. Change-Id: Ib4f04e2ad5c7f1528b4a13aa39db84b2b275904f Reviewed-on: https://review.openstack.org/14364 Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- modules/jenkins/manifests/master.pp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/jenkins/manifests/master.pp b/modules/jenkins/manifests/master.pp index cce3636243..f2c6572a80 100644 --- a/modules/jenkins/manifests/master.pp +++ b/modules/jenkins/manifests/master.pp @@ -113,10 +113,26 @@ class jenkins::master( command => "apt-get update", } - file { "/var/lib/jenkins/plugins/simple-theme-plugin": + file { '/var/lib/jenkins': ensure => directory, owner => 'jenkins', - group => 'nogroup' + group => 'adm', + require => Package['jenkins'], + } + + file { '/var/lib/jenkins/plugins': + ensure => directory, + owner => 'jenkins', + group => 'nogroup', + mode => '0750', + require => File['/var/lib/jenkins'], + } + + file { '/var/lib/jenkins/plugins/simple-theme-plugin': + ensure => directory, + owner => 'jenkins', + group => 'nogroup', + require => File['/var/lib/jenkins/plugins'], } file { "/var/lib/jenkins/plugins/simple-theme-plugin/openstack.css":