From 2ac39a1309cce485fc673227b34c493915c44fa5 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 9 Apr 2013 13:51:10 +0000
Subject: [PATCH] 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
---
 manifests/site.pp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 3fd7f930d8..69bee37b2c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -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