BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342660 )
Change subject: labs: Remove references to tools-webgrid-lighttpd-12*
......................................................................
labs: Remove references to tools-webgrid-lighttpd-12*
Bug: T160442
Change-Id: Idce36fd14afc285f870cb38640467c7bea736838
---
M modules/role/files/toollabs/clush/tools-clush-generator
M modules/toollabs/files/gridscripts/README
M modules/toollabs/files/host_aliases
M modules/toollabs/templates/mail-relay.exim4.conf.erb
4 files changed, 1 insertion(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/342660/1
diff --git a/modules/role/files/toollabs/clush/tools-clush-generator
b/modules/role/files/toollabs/clush/tools-clush-generator
index 833f218..1607855 100644
--- a/modules/role/files/toollabs/clush/tools-clush-generator
+++ b/modules/role/files/toollabs/clush/tools-clush-generator
@@ -20,7 +20,6 @@
# Maps prefixes to hostgroup names
TOOLS_PREFIX_CLASSIFIER = {
- 'webgrid-lighttpd-12': 'webgrid-lighttpd-precise',
'webgrid-lighttpd-14': 'webgrid-lighttpd-trusty',
'webgrid-generic': 'webgrid-generic',
'webgrid-': 'webgrid',
diff --git a/modules/toollabs/files/gridscripts/README
b/modules/toollabs/files/gridscripts/README
index d16e72b..234e352 100644
--- a/modules/toollabs/files/gridscripts/README
+++ b/modules/toollabs/files/gridscripts/README
@@ -9,7 +9,7 @@
t - 24h
-------
- Gather up list of tools nodes to be rebooted into <hostlist>. An example list
-would look like: tools-exec-1205 tools-exec-1404 tools-webgrid-lighttpd-1205
+would look like: tools-exec-1404 tools-webgrid-lighttpd-1405
- Log in to tools-master and:
$ dequeugridnodes.sh <hostlist>
diff --git a/modules/toollabs/files/host_aliases
b/modules/toollabs/files/host_aliases
index 630685f..95979eb 100644
--- a/modules/toollabs/files/host_aliases
+++ b/modules/toollabs/files/host_aliases
@@ -25,26 +25,6 @@
tools-webgrid-generic-1402.eqiad.wmflabs
tools-webgrid-generic-1402.tools.eqiad.wmflabs
tools-webgrid-generic-1403.eqiad.wmflabs
tools-webgrid-generic-1403.tools.eqiad.wmflabs
tools-webgrid-generic-1403.eqiad.wmflabs
tools-webgrid-generic-1403.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1201.eqiad.wmflabs
tools-webgrid-lighttpd-1201.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1201.eqiad.wmflabs
tools-webgrid-lighttpd-1201.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1202.eqiad.wmflabs
tools-webgrid-lighttpd-1202.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1202.eqiad.wmflabs
tools-webgrid-lighttpd-1202.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1203.eqiad.wmflabs
tools-webgrid-lighttpd-1203.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1203.eqiad.wmflabs
tools-webgrid-lighttpd-1203.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1204.eqiad.wmflabs
tools-webgrid-lighttpd-1204.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1204.eqiad.wmflabs
tools-webgrid-lighttpd-1204.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1205.eqiad.wmflabs
tools-webgrid-lighttpd-1205.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1205.eqiad.wmflabs
tools-webgrid-lighttpd-1205.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1206.eqiad.wmflabs
tools-webgrid-lighttpd-1206.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1206.eqiad.wmflabs
tools-webgrid-lighttpd-1206.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1207.eqiad.wmflabs
tools-webgrid-lighttpd-1207.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1207.eqiad.wmflabs
tools-webgrid-lighttpd-1207.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1208.eqiad.wmflabs
tools-webgrid-lighttpd-1208.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1208.eqiad.wmflabs
tools-webgrid-lighttpd-1208.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1209.eqiad.wmflabs
tools-webgrid-lighttpd-1209.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1209.eqiad.wmflabs
tools-webgrid-lighttpd-1209.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1210.eqiad.wmflabs
tools-webgrid-lighttpd-1210.tools.eqiad.wmflabs
-tools-webgrid-lighttpd-1210.eqiad.wmflabs
tools-webgrid-lighttpd-1210.tools.eqiad.wmflabs
tools-webgrid-lighttpd-1401.eqiad.wmflabs
tools-webgrid-lighttpd-1401.tools.eqiad.wmflabs
tools-webgrid-lighttpd-1401.eqiad.wmflabs
tools-webgrid-lighttpd-1401.tools.eqiad.wmflabs
tools-webgrid-lighttpd-1402.eqiad.wmflabs
tools-webgrid-lighttpd-1402.tools.eqiad.wmflabs
diff --git a/modules/toollabs/templates/mail-relay.exim4.conf.erb
b/modules/toollabs/templates/mail-relay.exim4.conf.erb
index eb301ef..ff8693e 100644
--- a/modules/toollabs/templates/mail-relay.exim4.conf.erb
+++ b/modules/toollabs/templates/mail-relay.exim4.conf.erb
@@ -38,16 +38,6 @@
tools-webgrid-generic-1401.eqiad.wmflabs : \
tools-webgrid-generic-1402.eqiad.wmflabs : \
tools-webgrid-generic-1403.eqiad.wmflabs : \
- tools-webgrid-lighttpd-1201.eqiad.wmflabs : \
- tools-webgrid-lighttpd-1202.eqiad.wmflabs : \
- tools-webgrid-lighttpd-1203.eqiad.wmflabs : \
- tools-webgrid-lighttpd-1204.eqiad.wmflabs : \
- tools-webgrid-lighttpd-1205.eqiad.wmflabs : \
- tools-webgrid-lighttpd-1206.eqiad.wmflabs : \
- tools-webgrid-lighttpd-1207.eqiad.wmflabs : \
- tools-webgrid-lighttpd-1208.eqiad.wmflabs : \
- tools-webgrid-lighttpd-1209.eqiad.wmflabs : \
- tools-webgrid-lighttpd-1210.eqiad.wmflabs : \
tools-webgrid-lighttpd-1401.eqiad.wmflabs : \
tools-webgrid-lighttpd-1402.eqiad.wmflabs : \
tools-webgrid-lighttpd-1403.eqiad.wmflabs : \
--
To view, visit https://gerrit.wikimedia.org/r/342660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idce36fd14afc285f870cb38640467c7bea736838
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
