Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/58898
Change subject: zuul: support specifying the git directory
......................................................................
zuul: support specifying the git directory
/var/lib/zuul/git might not always be wanted. The module learned git_dir
to change the git directory.
Change-Id: I269f4f818345c1ed4726f530c8d1195788067531
---
M modules/zuul/manifests/init.pp
M modules/zuul/templates/zuul.conf.erb
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/98/58898/1
diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 42e731c..adf5957 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -19,6 +19,7 @@
$status_url = "https://${::fqdn}/zuul/status";,
$git_source_repo = 'https://gerrit.wikimedia.org/r/p/integration/zuul.git',
$git_branch = 'master',
+ $git_dir = '/var/lib/zuul/git',
$push_change_refs,
) {
@@ -111,7 +112,7 @@
require => Package['jenkins'],
}
- file { '/var/lib/zuul/git':
+ file { $git_dir:
ensure => directory,
owner => 'jenkins',
require => Package['jenkins'],
diff --git a/modules/zuul/templates/zuul.conf.erb
b/modules/zuul/templates/zuul.conf.erb
index a4eac3c..9c81cdd 100644
--- a/modules/zuul/templates/zuul.conf.erb
+++ b/modules/zuul/templates/zuul.conf.erb
@@ -13,7 +13,7 @@
layout_config=/etc/zuul/wikimedia/layout.yaml
log_config=/etc/zuul/logging.conf
state_dir=/var/lib/zuul
-git_dir=/var/lib/zuul/git
+git_dir=<%= git_dir %>
push_change_refs=<%= push_change_refs %>
url_pattern=<%= url_pattern %>
status_url=<%= status_url %>
--
To view, visit https://gerrit.wikimedia.org/r/58898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I269f4f818345c1ed4726f530c8d1195788067531
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
