Browse Source

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
master
Colleen Murphy 10 months ago
parent
commit
790bf6a783
1 changed files with 6 additions and 8 deletions
  1. 6
    8
      manifests/site.pp

+ 6
- 8
manifests/site.pp View File

@@ -67,19 +67,17 @@ define reviewday::site(
67 67
     }
68 68
   }
69 69
 
70
-  file {'/var/lib/reviewday/reviewday':
71
-    ensure  => directory,
72
-    owner   => 'reviewday',
73
-    group   => 'reviewday',
74
-    mode    => '0755',
75
-    require => File['/var/lib/reviewday/'],
76
-  }
77
-
78 70
   vcsrepo { '/var/lib/reviewday/reviewday':
79 71
     ensure   => latest,
80 72
     provider => git,
81 73
     source   => $git_url,
82 74
     revision => 'master',
75
+    owner    => 'reviewday',
76
+    group    => 'reviewday',
77
+    require  => [
78
+      User['reviewday'],
79
+      Group['reviewday'],
80
+    ]
83 81
   }
84 82
 
85 83
   exec { 'install-reviewday-dependencies':

Loading…
Cancel
Save