Andrew Bogott has submitted this change and it was merged.
Change subject: Remove explicit creation of /var/lib/git/operations/puppet
......................................................................
Remove explicit creation of /var/lib/git/operations/puppet
Change-Id: I7acea76405e58353e386c0158be1fe644819593e
---
M modules/puppetmaster/manifests/gitclone.pp
1 file changed, 1 insertion(+), 6 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/manifests/gitclone.pp
b/modules/puppetmaster/manifests/gitclone.pp
index 4272c55..aace954 100644
--- a/modules/puppetmaster/manifests/gitclone.pp
+++ b/modules/puppetmaster/manifests/gitclone.pp
@@ -11,11 +11,6 @@
ensure => directory,
owner => 'root',
group => 'root';
- "${puppetmaster::gitdir}/operations/puppet":
- ensure => directory,
- owner => 'gitpuppet',
- group => 'root',
- require => File["${puppetmaster::gitdir}/operations"];
"${puppetmaster::gitdir}/operations/puppet/.git/hooks/post-merge":
require => Git::Clone['operations/puppet'],
owner => 'gitpuppet',
@@ -106,7 +101,7 @@
git::clone {
'operations/puppet':
- require => File["${puppetmaster::gitdir}/operations/puppet"],
+ require => File["${puppetmaster::gitdir}/operations"],
directory => "${puppetmaster::gitdir}/operations/puppet",
owner => 'gitpuppet',
branch => 'production',
--
To view, visit https://gerrit.wikimedia.org/r/96078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7acea76405e58353e386c0158be1fe644819593e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
