Cmjohnson has submitted this change and it was merged.
Change subject: decom'ing sq44 and 48 -removed from dsh, dhcpd, role.pp and
added to decom.pp
......................................................................
decom'ing sq44 and 48 -removed from dsh, dhcpd, role.pp and added to decom.pp
Change-Id: I350da4cade5963bd98241f0d39cdfe89c3ad3aa6
---
M files/dhcpd/linux-host-entries.ttyS1-57600
M files/dsh/group/ALL
M files/dsh/group/pmtpa
M files/dsh/group/pmtpa.upload
M files/dsh/group/sq
M files/dsh/group/sq.old
M manifests/decommissioning.pp
M manifests/role/cache.pp
8 files changed, 2 insertions(+), 29 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 c6ab885..8c2be03 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-57600
+++ b/files/dhcpd/linux-host-entries.ttyS1-57600
@@ -162,20 +162,6 @@
filename "lucid-installer/ubuntu-installer/amd64/pxelinux.0";
}
-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 sq48 {
- hardware ethernet 00:19:B9:DF:48:A5;
- fixed-address sq48.wikimedia.org;
- option pxelinux.pathprefix "lucid-installer/";
- filename "lucid-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
host sq49 {
hardware ethernet 00:15:C5:F2:D8:4C;
fixed-address sq49.wikimedia.org;
diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL
index ee631ec..aee0287 100644
--- a/files/dsh/group/ALL
+++ b/files/dsh/group/ALL
@@ -76,9 +76,6 @@
sq37
sq43
-sq44
-
-sq48
sq49
sq50
sq51
diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa
index f06e69c..57a3082 100644
--- a/files/dsh/group/pmtpa
+++ b/files/dsh/group/pmtpa
@@ -166,9 +166,6 @@
sq37
sq43
-sq44
-
-sq48
sq49
sq50
sq51
diff --git a/files/dsh/group/pmtpa.upload b/files/dsh/group/pmtpa.upload
index 9fdd872..6c40005 100644
--- a/files/dsh/group/pmtpa.upload
+++ b/files/dsh/group/pmtpa.upload
@@ -1,6 +1,4 @@
sq43.wikimedia.org
-sq44.wikimedia.org
-sq48.wikimedia.org
sq49.wikimedia.org
sq50.wikimedia.org
sq51.wikimedia.org
diff --git a/files/dsh/group/sq b/files/dsh/group/sq
index 96385f4..99a6f40 100644
--- a/files/dsh/group/sq
+++ b/files/dsh/group/sq
@@ -1,7 +1,5 @@
sq37
sq43
-sq44
-sq48
sq49
sq50
sq51
diff --git a/files/dsh/group/sq.old b/files/dsh/group/sq.old
index 21cb733..8a6eb19 100644
--- a/files/dsh/group/sq.old
+++ b/files/dsh/group/sq.old
@@ -1,9 +1,6 @@
sq37
sq43
-sq44
-
-sq48
sq49
sq50
sq51
diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index 9320601..539db13 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -71,9 +71,11 @@
'sq40',
'sq41',
'sq42',
+'sq44',
'sq45',
'sq46',
'sq47',
+'sq48',
'ssl3004', #added 9/17
'virt1001',
'virt1002',
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 17f6be1..dd6178f 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -150,8 +150,6 @@
"upload" => {
"pmtpa-squid" => [
'sq43.wikimedia.org',
- 'sq44.wikimedia.org',
- 'sq48.wikimedia.org',
'sq49.wikimedia.org',
'sq50.wikimedia.org',
--
To view, visit https://gerrit.wikimedia.org/r/96878
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I350da4cade5963bd98241f0d39cdfe89c3ad3aa6
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
