Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/324233
Change subject: Abolish labtest realm.
......................................................................
Abolish labtest realm.
Most of these labtest settings were just duplicates of production
to make case statements happy. Those that differ are wrong.
Special labtest settings still exist, mainly based on hostname
prefix checks in hiera and host-specific lookups.
Bug: 324220
Change-Id: Iab3de7cee4839d5dabbe71c02b222700af7ac608
---
M manifests/realm.pp
M modules/ldap/manifests/role/config/labs.pp
M modules/network/manifests/constants.pp
3 files changed, 0 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/324233/1
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 94aa355..6a6bbac 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -36,11 +36,6 @@
default => '(undefined)'
}
-# Lab testing cluster all prefix labtest
-if $::hostname =~ /^labtest/ {
- $realm = 'labtest'
-}
-
if $realm == undef {
$realm = hiera('realm', 'production')
}
@@ -238,7 +233,6 @@
'deployment-prep' => [ 'deployment-mx.eqiad.wmflabs' ],
default => [ 'mx1001.wikimedia.org', 'mx2001.wikimedia.org'
],
},
- 'labtest' => [ 'wiki-mail-codfw.wikimedia.org',
'wiki-mail-eqiad.wikimedia.org' ],
}
# Generic, default servers (order matters!)
$mail_smarthost = $realm ? {
@@ -249,5 +243,4 @@
},
# FIXME: find some SMTP servers for labs
'labs' => [ 'mx1001.wikimedia.org', 'mx2001.wikimedia.org' ],
- 'labtest' => [ 'mx1001.wikimedia.org', 'mx2001.wikimedia.org' ],
}
diff --git a/modules/ldap/manifests/role/config/labs.pp
b/modules/ldap/manifests/role/config/labs.pp
index c4babb2..770fcbd 100644
--- a/modules/ldap/manifests/role/config/labs.pp
+++ b/modules/ldap/manifests/role/config/labs.pp
@@ -4,7 +4,6 @@
$basedn = 'dc=wikimedia,dc=org'
$servernames = [ $hieraldapconfig['hostname'],
$hieraldapconfig['secondary_hostname'] ]
$sudobasedn = $::realm ? {
- 'labtest' =>
"ou=sudoers,cn=${::labsproject},ou=projects,${basedn}",
'labs' => "ou=sudoers,cn=${::labsproject},ou=projects,${basedn}",
'production' => "ou=sudoers,${basedn}"
}
diff --git a/modules/network/manifests/constants.pp
b/modules/network/manifests/constants.pp
index 3f68c0b..d8779be 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -69,40 +69,6 @@
'2620:0:860:101:10:192:0:27', #
puppetmaster2001.codfw.wmnet
],
},
- 'labtest' => {
- 'bastion_hosts' => [
- '208.80.154.149', #
bast1001.wikimedia.org
- '2620:0:861:2:208:80:154:149', #
bast1001.wikimedia.org
- '208.80.153.5', #
bast2001.wikimedia.org
- '2620:0:860:1:208:80:153:5', #
bast2001.wikimedia.org
- '91.198.174.112', #
bast3001.wikimedia.org
- '2620:0:862:1:91:198:174:112', #
bast3001.wikimedia.org
- '198.35.26.5', #
bast4001.wikimedia.org
- '2620:0:863:1:198:35:26:5', #
bast4001.wikimedia.org
- '208.80.154.151', # iron.wikimedia.org
- '2620:0:861:2:208:80:154:151', # iron.wikimedia.org
- ],
- 'monitoring_hosts' => [
- '208.80.153.74', # tegmen.wikimedia.org
- '2620:0:860:3:208:80:153:74', # tegmen.wikimedia.org
- '208.80.155.119', #
einsteinium.wikimedia.org
- '2620:0:860:3:208:80:155:119', #
einsteinium.wikimedia.org
- '208.80.154.53', #
uranium.wikimedia.org (ganglia, gmetad needs it)
- '2620:0:861:1:208:80:154:53', # uranium.wikimedia.org
- ],
- 'deployment_hosts' => [
- '10.64.0.196', # tin.eqiad.wmnet
- '2620:0:861:101:10:64:0:196', # tin.eqiad.wmnet
- '10.192.16.132', # mira.codfw.wmnet
- '2620:0:860:102:10:192:16:132', # mira.codfw.wmnet
- ],
- 'maintenance_hosts' => [
- '10.64.32.13', # terbium.eqiad.wmnet
- '2620:0:861:103:10:64:32:13', # terbium.eqiad.wmnet
- '10.192.48.45', # wasat.codfw.wmnet
- '2620:0:860:104:10:192:48:45', # wasat.codfw.wmnet
- ],
- },
'labs' => {
'bastion_hosts' => concat([
'10.68.17.232', # bastion-01.eqiad.wmflabs
@@ -162,9 +128,6 @@
$mw_appserver_networks = flatten([
slice_network_constants('labs'),
'127.0.0.1'])
- } elsif $::realm == 'labtest' {
- # This just a placeholder... .erb doesn't like this to be empty.
- $mw_appserver_networks = ['208.80.152.0/22']
}
# Analytics subnets
--
To view, visit https://gerrit.wikimedia.org/r/324233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab3de7cee4839d5dabbe71c02b222700af7ac608
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
