Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59721
Change subject: zuul: drop dupe file reference in production
......................................................................
zuul: drop dupe file reference in production
role::zuul::production defined a file { '/srv/ssd/git' } which is also
passed as $git_dir to the module which then creates a file { $git_dir }
ending up with a dupe reference.
this patch removes the file{} statement in the role class. We should
later on ensure we have /srv/ssd mounted though. I have left a note
about it.
Change-Id: Id6fc1c59fe01044617fd27ee7a82fb048e76b9da
---
M manifests/role/zuul.pp
1 file changed, 1 insertion(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/59721/1
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index d541bde..a3d191e 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -41,22 +41,7 @@
system_role { "role::zuul::production": description => "Zuul on
production" }
- # Create directory that would hold the git repos
- file { '/srv/ssd/zuul':
- ensure => directory,
- owner => 'jenkins',
- group => 'jenkins',
- mode => '2775',
- require => Mount['/srv/ssd'],
- }
- file { '/srv/ssd/zuul/git':
- ensure => directory,
- owner => 'jenkins',
- group => 'jenkins',
- mode => '2775',
- require => File['/srv/ssd/zuul'],
- }
-
+ # TODO: should require Mount['/srv/ssd']
zuulwikimedia::instance { "zuul-production":
jenkins_server =>
'https://integration.wikimedia.org/ci',
jenkins_user => 'zuul-bot',
--
To view, visit https://gerrit.wikimedia.org/r/59721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6fc1c59fe01044617fd27ee7a82fb048e76b9da
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
