Cmjohnson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/85988


Change subject: Decommissioning sq45, removing some missed decom entries
......................................................................

Decommissioning sq45, removing some missed decom entries

Change-Id: I1950f8cb5cdd684f57db69a53d1f5c9715299d10
---
M files/dhcpd/linux-host-entries.ttyS1-57600
M files/dsh/group/ALL
M files/dsh/group/nagios
M files/dsh/group/pmtpa
M files/dsh/group/pmtpa.text
M files/dsh/group/pmtpa.upload
M files/dsh/group/sq
M manifests/decommissioning.pp
8 files changed, 3 insertions(+), 44 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/85988/1

diff --git a/files/dhcpd/linux-host-entries.ttyS1-57600 
b/files/dhcpd/linux-host-entries.ttyS1-57600
index 081fee7..e6af2e9 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-57600
+++ b/files/dhcpd/linux-host-entries.ttyS1-57600
@@ -340,13 +340,6 @@
        filename "lucid-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
-host sq42 {
-       hardware ethernet 00:19:B9:DF:45:8A;
-       fixed-address sq42.wikimedia.org;
-       option pxelinux.pathprefix "lucid-installer/";
-       filename "lucid-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
 host sq43 {
        hardware ethernet 00:19:B9:DF:48:78;
        fixed-address sq43.wikimedia.org;
@@ -357,13 +350,6 @@
 host sq44 {
        hardware ethernet 00:15:C5:F2:D9:32;
        fixed-address sq44.wikimedia.org;
-       option pxelinux.pathprefix "lucid-installer/";
-       filename "lucid-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
-host sq45 {
-       hardware ethernet 00:19:B9:DF:48:5F;
-       fixed-address sq45.wikimedia.org;
        option pxelinux.pathprefix "lucid-installer/";
        filename "lucid-installer/ubuntu-installer/amd64/pxelinux.0";
 }
diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL
index fec1b30..0c6dd119 100644
--- a/files/dsh/group/ALL
+++ b/files/dsh/group/ALL
@@ -116,17 +116,11 @@
 cp1043
 cp1044
 
-sq36
 sq37
-sq38
-sq39
-sq40
 
 sq43
 sq44
-sq45
-sq46
-sq47
+
 sq48
 sq49
 sq50
diff --git a/files/dsh/group/nagios b/files/dsh/group/nagios
index f33e6a9..233ce46 100644
--- a/files/dsh/group/nagios
+++ b/files/dsh/group/nagios
@@ -118,7 +118,6 @@
 mw54
 srv229
 mw14
-sq45
 db25
 srv270
 srv261
@@ -152,7 +151,6 @@
 mw31
 srv193
 mw1134
-sq40
 dataset2
 srv251
 mw57
@@ -366,7 +364,6 @@
 amssq43
 db16
 amssq60
-sq36
 db1044
 db29
 amssq53
diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa
index bd42959..17723e7 100644
--- a/files/dsh/group/pmtpa
+++ b/files/dsh/group/pmtpa
@@ -254,21 +254,10 @@
 sq28
 sq29
 sq30
-sq31
-sq33
-sq34
-sq35
-sq36
 sq37
-sq38
-sq39
-sq40
-sq42
 sq43
 sq44
-sq45
-sq46
-sq47
+
 sq48
 sq49
 sq50
diff --git a/files/dsh/group/pmtpa.text b/files/dsh/group/pmtpa.text
index aa17f8b..40ad837 100644
--- a/files/dsh/group/pmtpa.text
+++ b/files/dsh/group/pmtpa.text
@@ -1,5 +1,3 @@
-sq33.wikimedia.org
-sq36.wikimedia.org
 sq37.wikimedia.org
 sq59.wikimedia.org
 sq60.wikimedia.org
diff --git a/files/dsh/group/pmtpa.upload b/files/dsh/group/pmtpa.upload
index 867d13c..9fdd872 100644
--- a/files/dsh/group/pmtpa.upload
+++ b/files/dsh/group/pmtpa.upload
@@ -1,7 +1,5 @@
-sq42.wikimedia.org
 sq43.wikimedia.org
 sq44.wikimedia.org
-sq45.wikimedia.org
 sq48.wikimedia.org
 sq49.wikimedia.org
 sq50.wikimedia.org
diff --git a/files/dsh/group/sq b/files/dsh/group/sq
index de4ca53..96385f4 100644
--- a/files/dsh/group/sq
+++ b/files/dsh/group/sq
@@ -1,10 +1,6 @@
-sq33
-sq36
 sq37
-sq42
 sq43
 sq44
-sq45
 sq48
 sq49
 sq50
diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index 7ac35ed..81160c6 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -166,6 +166,7 @@
 'sq40',
 'sq41',
 'sq42',
+'sq45',
 'sq46',
 'sq47',
 'srv86',

-- 
To view, visit https://gerrit.wikimedia.org/r/85988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1950f8cb5cdd684f57db69a53d1f5c9715299d10
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to