Andrew Bogott has submitted this change and it was merged.
Change subject: Tools: Unify Tools and Toolsbeta configuration
......................................................................
Tools: Unify Tools and Toolsbeta configuration
To properly test Tools puppetization in Toolsbeta, with the advent of
multi-instance self hosted puppetmasters in Labs, it is easier to use
a dedicated puppetmaster for Toolsbeta and assign "standard" Tools
roles to the instances.
Both has already been done; the only change with regard to Tools
itself is setting the maildomain conditionally. This needs to be
verified after merging this change and a subsequent Puppet run on
tools-mail.
Change-Id: I45a27e02ed6616c20189964b2eade5b693b63ead
---
D manifests/role/labsbeta.pp
M manifests/role/labstools.pp
2 files changed, 6 insertions(+), 55 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labsbeta.pp b/manifests/role/labsbeta.pp
deleted file mode 100644
index b23c9c0..0000000
--- a/manifests/role/labsbeta.pp
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# This is a nice generic place to make project-specific roles with a sane
-# naming scheme.
-#
-
-class role::labs::toolsbeta {
-
- class config {
- include role::labsnfs::client # temporary measure
- $grid_master = 'toolsbeta-master.pmtpa.wmflabs'
- }
-
- class bastion inherits role::labs::toolsbeta::config {
- system::role { 'role::labs::toolsbeta::bastion': description => 'Tool
Labs bastion' }
- class { 'toollabs::bastion':
- gridmaster => $grid_master,
- }
- }
-
- class execnode inherits role::labs::toolsbeta::config {
- system::role { 'role::labs::toolsbeta::execnode': description => 'Tool
Labs execution host' }
- class { 'toollabs::execnode':
- gridmaster => $grid_master,
- }
- }
-
- class master inherits role::labs::toolsbeta::config {
- system::role { 'role::labs::toolsbeta::master': description => 'Tool
Labs gridengine master' }
- class { 'toollabs::master': }
- }
-
- class shadow inherits role::labs::toolsbeta::config {
- system::role { 'role::labs::toolsbeta::shadow': description => 'Tool
Labs gridengine shadow (backup) master' }
- class { 'toollabs::shadow':
- gridmaster => $grid_master,
- }
- }
-
- class mailrelay inherits role::labs::toolsbeta::config {
- system::role { 'role::labs::toolsbeta::mailrelay': description =>
'Tool Labs mail relay' }
- class { 'toollabs::mailrelay':
- maildomain => 'tools-beta.wmflabs.org',
- gridmaster => $grid_master,
- }
- }
-
- class redis inherits role::labs::toolsbeta::config {
- system::role { 'role::labs::toolsbeta::redis': description => 'Server
that hosts shared Redis instance' }
- class { 'toollabs::redis': }
- }
-
-} # class role::labs::tools
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index acdac2d..5aec7bf 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -7,8 +7,8 @@
}
$grid_master = $::site? {
- 'eqiad' => 'tools-master.eqiad.wmflabs',
- default => 'tools-master.pmtpa.wmflabs',
+ 'eqiad' => "${::instanceproject}-master.eqiad.wmflabs",
+ default => "${::instanceproject}-master.pmtpa.wmflabs",
}
}
@@ -70,7 +70,10 @@
class mailrelay inherits role::labs::tools::config {
system::role { 'role::labs::tools::mailrelay': description => 'Tool
Labs mail relay' }
class { 'toollabs::mailrelay':
- maildomain => 'tools.wmflabs.org',
+ maildomain => $::instanceproject ? {
+ 'toolsbeta' => 'tools-beta.wmflabs.org',
+ default => 'tools.wmflabs.org',
+ },
gridmaster => $grid_master,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/102385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45a27e02ed6616c20189964b2eade5b693b63ead
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Petrb <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
