From 790bf6a783b6202251a92c6ee1e42b3a63244cfd Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen.murphy@suse.de>
Date: Fri, 13 Jul 2018 14:27:28 +0200
Subject: [PATCH] Don't create reviewday subdirectory

Perhaps because of the new resource ordering algorithm, on puppet 4 the
/var/lib/reviewday/reviewday file resource blocks the
/var/lib/reviewday/reviewday vcsrepo resource and results in failures
like:

 Error: /Stage[main]/Main/Reviewday::Site[reviewday]/Vcsrepo[/var/lib/reviewday/reviewday]/ensure: change from absent to latest failed: Could not create repository (non-repository at path)

On both puppet 3 and puppet 4 the vcsrepo resource will create the
directory on its own, and it can also manage the directory's owner and
group itself, so there is no need for it to be managed independently.

Change-Id: Ic64d39a9f257d623ca13e9d38708eaa1e32e8c18
---
 manifests/site.pp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index e898813..736eb3f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -67,19 +67,17 @@ define reviewday::site(
     }
   }
 
-  file {'/var/lib/reviewday/reviewday':
-    ensure  => directory,
-    owner   => 'reviewday',
-    group   => 'reviewday',
-    mode    => '0755',
-    require => File['/var/lib/reviewday/'],
-  }
-
   vcsrepo { '/var/lib/reviewday/reviewday':
     ensure   => latest,
     provider => git,
     source   => $git_url,
     revision => 'master',
+    owner    => 'reviewday',
+    group    => 'reviewday',
+    require  => [
+      User['reviewday'],
+      Group['reviewday'],
+    ]
   }
 
   exec { 'install-reviewday-dependencies':