Andrew Bogott has submitted this change and it was merged.
Change subject: Remove explicit creation of /var/lib/git/operations/software
......................................................................
Remove explicit creation of /var/lib/git/operations/software
It's created by the git::clone call; duplicate definition
was causing problems.
Change-Id: Iaf139d9f2d5afdbca117bcda571f444ddd046c81
---
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 6fab542..4272c55 100644
--- a/modules/puppetmaster/manifests/gitclone.pp
+++ b/modules/puppetmaster/manifests/gitclone.pp
@@ -16,11 +16,6 @@
owner => 'gitpuppet',
group => 'root',
require => File["${puppetmaster::gitdir}/operations"];
- "${puppetmaster::gitdir}/operations/software":
- 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',
@@ -117,7 +112,7 @@
branch => 'production',
origin =>
'https://gerrit.wikimedia.org/r/p/operations/puppet';
'operations/software':
- require => File["${puppetmaster::gitdir}/operations/software"],
+ require => File["${puppetmaster::gitdir}/operations"],
owner => 'gitpuppet',
directory => "${puppetmaster::gitdir}/operations/software",
origin =>
'https://gerrit.wikimedia.org/r/p/operations/software';
--
To view, visit https://gerrit.wikimedia.org/r/96076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf139d9f2d5afdbca117bcda571f444ddd046c81
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
