Cmjohnson has submitted this change and it was merged.
Change subject: Removing site.pp entries for wm126-134
......................................................................
Removing site.pp entries for wm126-134
Change-Id: I1ff125f36863022f19b8e4bbb6bde9c6640d25ec
---
M files/dhcpd/linux-host-entries.ttyS1-115200
M manifests/site.pp
2 files changed, 0 insertions(+), 75 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 2894d74..ce421f3 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2591,51 +2591,6 @@
fixed-address mw125.pmtpa.wmnet;
}
-host mw126 {
- hardware ethernet 90:B1:1C:27:8D:C6;
- fixed-address mw126.pmtpa.wmnet;
-}
-
-host mw127 {
- hardware ethernet 90:B1:1C:28:DE:09;
- fixed-address mw127.pmtpa.wmnet;
-}
-
-host mw128 {
- hardware ethernet 90:B1:1C:23:24:61;
- fixed-address mw128.pmtpa.wmnet;
-}
-
-host mw129 {
- hardware ethernet 90:B1:1C:27:8C:FE;
- fixed-address mw129.pmtpa.wmnet;
-}
-
-host mw130 {
- hardware ethernet 90:B1:1C:27:A3:9C;
- fixed-address mw130.pmtpa.wmnet;
-}
-
-host mw131 {
- hardware ethernet 90:B1:1C:28:DA:84;
- fixed-address mw131.pmtpa.wmnet;
-}
-
-host mw132 {
- hardware ethernet 90:B1:1C:28:DB:6E;
- fixed-address mw132.pmtpa.wmnet;
-}
-
-host mw133 {
- hardware ethernet 90:B1:1C:0F:03:FA;
- fixed-address mw133.pmtpa.wmnet;
-}
-
-host mw134 {
- hardware ethernet 90:B1:1C:27:84:B8;
- fixed-address mw134.pmtpa.wmnet;
-}
-
host mw1001 {
hardware ethernet 84:2b:2b:78:2c:b4;
fixed-address mw1001.eqiad.wmnet;
diff --git a/manifests/site.pp b/manifests/site.pp
index e5713d2..57451e6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1996,36 +1996,6 @@
include nfs::upload
}
-# mw126-130 are application servers (precise)
-node /^mw1(2[6-9]|30)\.pmtpa\.wmnet$/ {
- include role::applicationserver::appserver
- include nfs::upload
-}
-
-# mw131-134 are pulled for elasticsearch testing
-# approved by site architect afeldman ;)
-node "mw131.pmtpa.wmnet" {
- include accounts::manybubbles,
- accounts::demon
-
- sudo_user { [ "manybubbles" ]: privileges => ['ALL = NOPASSWD: ALL'] }
- sudo_user { [ "demon" ]: privileges => ['ALL = NOPASSWD: ALL'] }
-
- include role::applicationserver::appserver
- include nfs::upload
-}
-node /^mw13[234]\.pmtpa\.wmnet$/ {
- include accounts::manybubbles,
- accounts::demon,
- groups::wikidev
-
- sudo_user { [ "manybubbles" ]: privileges => ['ALL = NOPASSWD: ALL'] }
- sudo_user { [ "demon" ]: privileges => ['ALL = NOPASSWD: ALL'] }
-
- include standard
- include role::elasticsearch::production
-}
-
# mw1001-1016 are jobrunners (precise)
node /^mw10(0[1-9]|1[0-6])\.eqiad\.wmnet$/ {
if $::hostname =~ /^mw100[12]$/ {
--
To view, visit https://gerrit.wikimedia.org/r/91882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ff125f36863022f19b8e4bbb6bde9c6640d25ec
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson <[email protected]>
Gerrit-Reviewer: Cmjohnson <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
