From 46ebb448c158c43794622f6afdff9fb973fb89ce Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 5 Apr 2013 14:49:18 -0700
Subject: [PATCH] Force directory deletion in zuul.pp.

* 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
---
 modules/openstack_project/manifests/zuul.pp | 28 +++++----------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/modules/openstack_project/manifests/zuul.pp b/modules/openstack_project/manifests/zuul.pp
index b2f71ee891..fb6b6f6ded 100644
--- a/modules/openstack_project/manifests/zuul.pp
+++ b/modules/openstack_project/manifests/zuul.pp
@@ -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,
+    ensure => absent,
+    force  => true,
   }
 
   file { '/opt/jquery-graphite':
-    ensure   => absent,
-  }
-
-  file { '/var/lib/zuul/www/jquery-graphite.js':
-    ensure   => absent,
+    ensure => absent,
+    force  => true,
   }
 }