Remove absent directories forcibly.

* manifests/site.pp: Setting the ~jenkins/.config/glance directory
recursively absent on unit test slaves in 35ccdfc was an
insufficient measure to remove it and its contents. According to
Puppet documentation force must also be used to remove the file
resource if it is a directory type, so this change adds that
parameter.

Change-Id: I834c229b83d6ffd8c0c1a3f4912699a775e01825
Reviewed-on: https://review.openstack.org/26482
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
This commit is contained in:
Jeremy Stanley 2013-04-09 13:51:10 +00:00 committed by Jenkins
parent 2c84895155
commit 2ac39a1309

View File

@ -292,6 +292,7 @@ node /^quantal.*\.slave\.openstack\.org$/ {
}
file { '/home/jenkins/.config/glance':
ensure => absent,
force => true,
recurse => true,
}
include jenkins::cgroups
@ -312,6 +313,7 @@ node /^precise.*\.slave\.openstack\.org$/ {
}
file { '/home/jenkins/.config/glance':
ensure => absent,
force => true,
recurse => true,
}
include jenkins::cgroups
@ -332,6 +334,7 @@ node /^oneiric.*\.slave\.openstack\.org$/ {
}
file { '/home/jenkins/.config/glance':
ensure => absent,
force => true,
recurse => true,
}
include jenkins::cgroups
@ -353,6 +356,7 @@ node /^rhel6.*\.slave\.openstack\.org$/ {
}
file { '/home/jenkins/.config/glance':
ensure => absent,
force => true,
recurse => true,
}
include jenkins::cgroups