Cmjohnson has submitted this change and it was merged.
Change subject: Removing dhcpd and netboot entries for tola,kuo,celsus and
lardner
......................................................................
Removing dhcpd and netboot entries for tola,kuo,celsus and lardner
Change-Id: I7a49b0ea2a0f2c81d204c614795aecf11b9882d0
---
M files/autoinstall/netboot.cfg
M files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 2 insertions(+), 32 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index ce0cc6d..03ebb8d 100755
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -43,8 +43,8 @@
calcium|helium|potassium|tmh1001|tmh1002) echo
partman/raid1-1partition.cfg ;; \
capella) echo partman/lvs.cfg ;; \
cp102[1-9]|cp10[3-6][0-9]|cp1070|cp[34]0[0-9][0-9]|sq6[7-9]|sq70|dysprosium)
echo partman/raid1-varnish.cfg ;; \
-
antimony|arsenic|barium|celsus|erbium|gadolinium|holmium|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium|wtp100[1-4])
echo partman/lvm.cfg ;; \
- kuo|lardner|mexia|tola) echo partman/lvm.cfg ;; \
+
antimony|arsenic|barium|erbium|gadolinium|holmium|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium|wtp100[1-4])
echo partman/lvm.cfg ;; \
+ mexia) echo partman/lvm.cfg ;; \
lvs[1-6]|lvs100*) echo partman/lvs.cfg ;; \
lvs400*) echo partman/raid1-lvm.cfg ;; \
ekrem) echo partman/raid1.cfg ;; \
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 6b149d2..20897c6 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -249,11 +249,6 @@
fixed-address carbon.wikimedia.org;
}
-host celsus {
- hardware ethernet D4:AE:52:B3:90:36;
- fixed-address celsus.pmtpa.wmnet;
-}
-
host cerium {
hardware ethernet 90:B1:1C:00:A0:21;
fixed-address cerium.eqiad.wmnet;
@@ -1431,11 +1426,6 @@
fixed-address iron.wikimedia.org;
}
-host kuo {
- hardware ethernet D4:AE:52:AD:56:10;
- fixed-address kuo.pmtpa.wmnet;
-}
-
host labstore1 {
hardware ethernet 78:2b:cb:76:1c:d2;
fixed-address labstore1.pmtpa.wmnet;
@@ -1479,11 +1469,6 @@
host lanthanum {
hardware ethernet 90:B1:1C:00:A2:67;
fixed-address lanthanum.eqiad.wmnet;
-}
-
-host lardner {
- hardware ethernet D4:AE:52:AD:59:99;
- fixed-address lardner.pmtpa.wmnet;
}
host lvs5 {
@@ -4495,16 +4480,6 @@
fixed-address tin.eqiad.wmnet;
}
-host tmh1 {
- hardware ethernet d4:be:d9:af:68:a0;
- fixed-address tmh1.pmtpa.wmnet;
-}
-
-host tmh2 {
- hardware ethernet d4:be:d9:af:68:6a;
- fixed-address tmh2.pmtpa.wmnet;
-}
-
host tmh1001 {
hardware ethernet 18:03:73:f1:4f:82;
fixed-address tmh1001.eqiad.wmnet;
@@ -4513,11 +4488,6 @@
host tmh1002 {
hardware ethernet 18:03:73:f1:59:5a;
fixed-address tmh1002.eqiad.wmnet;
-}
-
-host tola {
- hardware ethernet 90:B1:1C:00:AE:28;
- fixed-address tola.pmtpa.wmnet;
}
host tungsten {
--
To view, visit https://gerrit.wikimedia.org/r/93857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a49b0ea2a0f2c81d204c614795aecf11b9882d0
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
