opendev/system-config
Code Issues Proposed changes

Force directory deletion in zuul.pp.

Browse Source 
* modules/openstack_project/manifests/zuul.pp: Force the removal of
/var/lib/zuul/www, /opt/jquery-visibility, and /opt/jquery-graphite as
these are directories and puppet will not remove them without the force
option. Remove /var/lib/zuul/www recursively allowing us to remove
specific management for files in that dir. Also, align whitespace in
that section of zuul.pp while we are touching the file.

Change-Id: Iae2af7aba08e7ddb0f7e359287de253b7d212ada
Reviewed-on: https://review.openstack.org/26268
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2013-04-05 14:49:18 -07:00 committed by Jenkins
parent 0a5b28f6bb
commit 46ebb448c1
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/openstack_project/manifests/zuul.pp
View File

@ -75,37 +75,21 @@ class openstack_project::zuul(
file { '/var/lib/zuul/www':
ensure => absent,
}
file { '/var/lib/zuul/www/index.html':
ensure => absent,
recurse => true,
force => true,
}
package { 'libjs-jquery':
ensure => absent,
}
file { '/var/lib/zuul/www/jquery.min.js':
ensure => absent,
}
file { '/var/lib/zuul/www/status.js':
ensure => absent,
}
file { '/opt/jquery-visibility':
ensure => absent,
}
file { '/var/lib/zuul/www/jquery-visibility.min.js':
ensure => absent,
force => true,
}
file { '/opt/jquery-graphite':
ensure => absent,
}
file { '/var/lib/zuul/www/jquery-graphite.js':
ensure => absent,
force => true,
}
}