Ottomata has submitted this change and it was merged.
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. Also updated the zuulwikimedia class to
support the new parameter.
Change-Id: I269f4f818345c1ed4726f530c8d1195788067531
---
M manifests/zuul.pp
M modules/zuul/manifests/init.pp
M modules/zuul/templates/zuul.conf.erb
3 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Demon: Looks good to me, but someone else must approve
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/zuul.pp b/manifests/zuul.pp
index bebfb53..ecf0dd7 100644
--- a/manifests/zuul.pp
+++ b/manifests/zuul.pp
@@ -11,6 +11,7 @@
$gerrit_user,
$url_pattern,
$status_url,
+ $git_dir='/var/lib/zuul/git',
$push_change_refs
) {
@@ -28,6 +29,7 @@
gerrit_user => $gerrit_user,
url_pattern => $url_pattern,
status_url => $status_url,
+ git_dir => $git_dir,
push_change_refs => $push_change_refs,
}
diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index ea07d4a..ed45c01 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -110,7 +110,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: merged
Gerrit-Change-Id: I269f4f818345c1ed4726f530c8d1195788067531
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
