Alexandros Kosiaris has submitted this change and it was merged.
Change subject: zuul: introduced config hash in role::zuul::configuration
......................................................................
zuul: introduced config hash in role::zuul::configuration
I would like to split the role class between server/merger instead of
between realms.
The roles used in production and labs are very similiar. Based on the
existing role::cache::configuration, this introduce configuration hash
with $::realm as key. Let us easily change the configuration and we will
later on be able to share the same role class on both labs and
production.
Change-Id: I3699567354b4fbb540c1d4e4aaafbd41ed31db6f
---
M manifests/role/zuul.pp
1 file changed, 13 insertions(+), 9 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index dfbd5bc..c80d70c 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -7,11 +7,15 @@
# Realm based configuration for Zuul roles.
class role::zuul::configuration {
- $zuul_git_dir = $::realm ? {
- 'production' => '/srv/ssd/zuul/git',
- 'labs' => '/srv/zuul/git',
-# FIXME migrate under /data/project whenever bug 64868 is solved
-# 'labs' => '/data/project/zuul/git',
+ $merger = {
+ 'production' => {
+ 'git_dir' => '/srv/ssd/zuul/git'
+ },
+ 'labs' => {
+ # FIXME migrate under /data/project whenever bug 64868 is solved
+ # 'git_dir' => '/data/project/zuul/git',
+ 'git_dir' => '/srv/zuul/git'
+ },
}
} # /role::zuul::configuration
@@ -43,7 +47,7 @@
status_url => 'http://integration.wmflabs.org/zuul/status',
zuul_url => 'git://localhost',
config_git_branch => 'labs',
- git_dir => $role::zuul::configuration::zuul_git_dir,
+ git_dir =>
$role::zuul::configuration::merger[$::realm]['git_dir'],
statsd_host => '',
git_email => "zuul-merger@${::instancename}",
git_name => 'Wikimedia Zuul Merger',
@@ -51,7 +55,7 @@
# Serves Zuul git repositories
class { 'contint::zuul::git-daemon':
- zuul_git_dir => $role::zuul::configuration::zuul_git_dir,
+ zuul_git_dir =>
$role::zuul::configuration::merger[$::realm]['git_dir'],
}
} # /role::zuul::labs
@@ -89,7 +93,7 @@
status_url => 'https://integration.wikimedia.org/zuul/',
zuul_url => 'git://zuul.eqiad.wmnet',
config_git_branch => 'master',
- git_dir => $role::zuul::configuration::zuul_git_dir,
+ git_dir =>
$role::zuul::configuration::merger[$::realm]['git_dir'],
statsd_host => 'statsd.eqiad.wmnet',
git_email => "zuul-merger@${::hostname}",
git_name => 'Wikimedia Zuul Merger',
@@ -97,7 +101,7 @@
# Serves Zuul git repositories on git://zuul.eqiad.wmnet/...
class { 'contint::zuul::git-daemon':
- zuul_git_dir => $role::zuul::configuration::zuul_git_dir,
+ zuul_git_dir =>
$role::zuul::configuration::merger[$::realm]['git_dir'],
}
} # /role::zuul::production
--
To view, visit https://gerrit.wikimedia.org/r/144708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3699567354b4fbb540c1d4e4aaafbd41ed31db6f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[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
