Cmjohnson has submitted this change and it was merged.
Change subject: decommissioning sq41
......................................................................
decommissioning sq41
Change-Id: I76ce5a528d2296c2118ade8b88fb301bde5444b4
---
M files/dhcpd/linux-host-entries.ttyS1-57600
M files/dsh/group/nagios
M files/dsh/group/sq
M manifests/decommissioning.pp
M manifests/site.pp
5 files changed, 4 insertions(+), 12 deletions(-)
Approvals:
Cmjohnson: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dhcpd/linux-host-entries.ttyS1-57600
b/files/dhcpd/linux-host-entries.ttyS1-57600
index 00ffe77..85af42a 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-57600
+++ b/files/dhcpd/linux-host-entries.ttyS1-57600
@@ -347,13 +347,6 @@
filename "lucid-installer/ubuntu-installer/amd64/pxelinux.0";
}
-host sq41 {
- hardware ethernet 00:15:C5:F2:D8:83;
- fixed-address sq41.wikimedia.org;
- option pxelinux.pathprefix "lucid-installer/";
- filename "lucid-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
host sq42 {
hardware ethernet 00:19:B9:DF:45:8A;
fixed-address sq42.wikimedia.org;
diff --git a/files/dsh/group/nagios b/files/dsh/group/nagios
index cbd5cf3..f757a21 100644
--- a/files/dsh/group/nagios
+++ b/files/dsh/group/nagios
@@ -615,7 +615,6 @@
sq34
sq85
singer
-sq41
fenari
google
srv255
diff --git a/files/dsh/group/sq b/files/dsh/group/sq
index 610f24e..de4ca53 100644
--- a/files/dsh/group/sq
+++ b/files/dsh/group/sq
@@ -1,7 +1,6 @@
sq33
sq36
sq37
-sq41
sq42
sq43
sq44
diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index 229ad10..f9a33f2 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -159,6 +159,7 @@
'sq38',
'sq39',
'sq40',
+'sq41',
'sq46',
'sq47',
'srv86',
diff --git a/manifests/site.pp b/manifests/site.pp
index 5836e06..b98c2c4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2586,10 +2586,10 @@
include role::cache::text
}
-# sq41-50 are old 4 disk upload squids
-node /sq(4[1-9]|50)\.wikimedia\.org/ {
+# sq42-50 are old 4 disk upload squids
+node /sq(4[2-9]|50)\.wikimedia\.org/ {
$squid_coss_disks = [ 'sdb5', 'sdc', 'sdd' ]
- if $hostname =~ /^sq4[12]$/ {
+ if $hostname =~ /^sq4[23]$/ {
$ganglia_aggregator = true
}
--
To view, visit https://gerrit.wikimedia.org/r/79829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I76ce5a528d2296c2118ade8b88fb301bde5444b4
Gerrit-PatchSet: 1
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
