Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102385
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
---
M manifests/role/labs.pp
D manifests/role/labsbeta.pp
2 files changed, 4 insertions(+), 71 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/102385/1
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 58e1f8f..21f1763 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -64,7 +64,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",
+ }
}
}
diff --git a/manifests/role/labsbeta.pp b/manifests/role/labsbeta.pp
deleted file mode 100644
index 290ba79..0000000
--- a/manifests/role/labsbeta.pp
+++ /dev/null
@@ -1,70 +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 webserver inherits role::labs::toolsbeta::config {
- system::role { "role::labs::toolsbeta::webserver": description => "Tool
Labs webserver" }
- class { 'toollabs::webserver':
- gridmaster => $grid_master,
- }
- }
-
- class webproxy inherits role::labs::toolsbeta::config {
- system::role { "role::labs::toolsbeta::webproxy": description => "Tool
Labs web proxy" }
- class { 'toollabs::webproxy': }
- }
-
- 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",
- }
- }
-
- class syslog inherits role::labs::toolsbeta::config {
- system::role { "role::labs::toolsbeta::syslog": description => "Central
logging server for tools and services" }
- class { 'toollabs::syslog': }
- }
-
- 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
-
--
To view, visit https://gerrit.wikimedia.org/r/102385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I45a27e02ed6616c20189964b2eade5b693b63ead
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
