Cmjohnson has submitted this change and it was merged.
Change subject: Removing install references to cobalt and nickel bug: task#
T121007
......................................................................
Removing install references to cobalt and nickel bug: task# T121007
Change-Id: I9533efdad89deccb5bfe3218fc20a6ecb7a2ce16
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 2 insertions(+), 12 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 0219209..bfb3bea 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -46,7 +46,7 @@
esac; \
\
case $(debconf-get netcfg/get_hostname) in \
- acamar|achernar|baham|cobalt|lithium|radon|rubidium|rhodium)
echo partman/raid1-lvm.cfg ;; \
+ acamar|achernar|baham|lithium|radon|rubidium|rhodium) echo
partman/raid1-lvm.cfg ;; \
analytics100[3-9]) echo partman/analytics-cisco.cfg ;; \
analytics1017) echo partman/raid1-30G.cfg ;; \
analytics1015) echo partman/raid1-lvm-ext4.cfg ;; \
@@ -111,7 +111,7 @@
mw1259|mw1260) echo partman/raid1-1partition.cfg ;; \
mw[0-9]*|osmium|rcs[0-9]*) echo partman/mw.cfg ;; \
mx1001|mx2001) echo partman/flat.cfg virtual.cfg ;; \
-
labservices1001|nembus|neptunium|nickel|protactinium|radium|scandium|silver|uranium)
echo partman/raid1.cfg ;; \
+
labservices1001|nembus|neptunium|protactinium|radium|scandium|silver|uranium)
echo partman/raid1.cfg ;; \
rdb100[7-8]) echo partman/raid1.cfg ;; \
osm-cp*) echo partman/mw.cfg ;; \
pc100[1-3]) echo partman/mw.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 0de5e88..e920094 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -314,11 +314,6 @@
fixed-address chromium.wikimedia.org;
}
-host cobalt {
- hardware ethernet 78:2b:cb:08:a1:68;
- fixed-address cobalt.wikimedia.org;
-}
-
host conf1001 {
hardware ethernet d4:ae:52:73:60:e6;
fixed-address conf1001.eqiad.wmnet;
@@ -5931,11 +5926,6 @@
fixed-address nescio.wikimedia.org;
option pxelinux.pathprefix "jessie-installer/";
filename "jessie-installer/debian-installer/amd64/pxelinux.0";
-}
-
-host nickel {
- hardware ethernet 78:2b:cb:08:aa:93;
- fixed-address nickel.wikimedia.org;
}
host nitrogen {
--
To view, visit https://gerrit.wikimedia.org/r/259275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9533efdad89deccb5bfe3218fc20a6ecb7a2ce16
Gerrit-PatchSet: 2
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
