Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399684 )
Change subject: decom: remove uranium from site,DHCP,netboot
......................................................................
decom: remove uranium from site,DHCP,netboot
Bug: T183209
Change-Id: I83b656b32ea38466e052b918bf17323e25348dfd
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 1 insertion(+), 13 deletions(-)
Approvals:
Cmjohnson: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index b9b9e58..ab0787b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2171,11 +2171,6 @@
interface::add_ip6_mapped { 'main': }
}
-# ex-Ganglia Web UI - ready for decom (T183209)
-node 'uranium.wikimedia.org' {
- role(spare::system)
-}
-
node /^labvirt100[0-9].eqiad.wmnet/ {
role(wmcs::openstack::main::virt)
include ::standard
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index c0f09ec..245f0fa 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -139,7 +139,7 @@
mw22*) echo partman/mw-raid1.cfg ;; \
mw[0-9]*) echo partman/mw.cfg ;; \
mx1001|mx2001) echo partman/flat.cfg virtual.cfg ;; \
- labservices1001|labservices1002|radium|silver|uranium) echo
partman/raid1.cfg ;; \
+ labservices1001|labservices1002|radium|silver) echo partman/raid1.cfg
;; \
osm-cp*) echo partman/mw.cfg ;; \
ores[12]00[1-9]) echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
oresrdb2001) echo partman/lvm-ext-srv.cfg virtual.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 9d53583..4f4a972 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6375,13 +6375,6 @@
fixed-address tungsten.eqiad.wmnet;
}
-host uranium {
- hardware ethernet 84:2b:2b:fb:a6:67;
- fixed-address uranium.wikimedia.org;
- option pxelinux.pathprefix "trusty-installer/";
- filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
host wasat {
hardware ethernet 14:02:ec:3f:47:8c;
fixed-address wasat.codfw.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/399684
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83b656b32ea38466e052b918bf17323e25348dfd
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Cmjohnson <cmjohn...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
