summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen.murphy@suse.de>2018-07-13 14:27:28 +0200
committerColleen Murphy <colleen@gazlene.net>2018-07-19 20:12:25 +0200
commit790bf6a783b6202251a92c6ee1e42b3a63244cfd (patch)
treefd0f3a0b89d34f442780c7ed0138a8d9b76b0946
parent3a042122ec2cfdbec9376ad9a3ef7603a5df4d33 (diff)
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
Notes
Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 01 Aug 2018 23:17:15 +0000 Reviewed-on: https://review.openstack.org/582524 Project: openstack-infra/puppet-reviewday Branch: refs/heads/master
-rw-r--r--manifests/site.pp14
1 files 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(
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 vcsrepo { '/var/lib/reviewday/reviewday': 70 vcsrepo { '/var/lib/reviewday/reviewday':
79 ensure => latest, 71 ensure => latest,
80 provider => git, 72 provider => git,
81 source => $git_url, 73 source => $git_url,
82 revision => 'master', 74 revision => 'master',
75 owner => 'reviewday',
76 group => 'reviewday',
77 require => [
78 User['reviewday'],
79 Group['reviewday'],
80 ]
83 } 81 }
84 82
85 exec { 'install-reviewday-dependencies': 83 exec { 'install-reviewday-dependencies':