Herron has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404517 )
Change subject: remove ganeti VM puppetcompiler1001.eqiad.wmnet
......................................................................
remove ganeti VM puppetcompiler1001.eqiad.wmnet
This VM was used for catalog diff between production v3 and v4 puppet
masters and is no longer needed.
Bug: T177254
Change-Id: If7b5cb40680573836c599906b7fc905fb6c03ab5
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
3 files changed, 1 insertion(+), 13 deletions(-)
Approvals:
Herron: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 57b6948..ce280c2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1776,11 +1776,6 @@
role(prometheus)
}
-node 'puppetcompiler1001.eqiad.wmnet' {
- role(test)
- interface::add_ip6_mapped { 'main': }
-}
-
node /^prometheus100[34]\.eqiad\.wmnet$/ {
role(prometheus)
}
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 03ebab5..47840fb 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -79,7 +79,7 @@
elastic20[0-2][0-9]|elastic203[0-6]) echo
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
labcontrol100[34]|labmon100[12]|mwlog[12]001|relforge100[12]|scb200[1-6]|stat100[56])
echo partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
analytics1003|cobalt|thorium) echo partman/raid10-gpt-srv-lvm-ext4.cfg
;; \
-
acrab|acrux|actinium|alcyone|aluminium|argon|boron|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|netmon1003|releases[12]001|nihal|nitrogen|planet[12]001|pollux|puppetcompiler1001|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium)
echo partman/flat.cfg virtual.cfg ;; \
+
acrab|acrux|actinium|alcyone|aluminium|argon|boron|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|netmon1003|releases[12]001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium)
echo partman/flat.cfg virtual.cfg ;; \
diadem|dysprosium) echo partman/flat.cfg virtual.cfg ;; \
kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
eventlog[1-2]001|ocg100[1-2]|scb100[1-4]) echo partman/raid1.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 20dd1e6..fdebd01 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -332,13 +332,6 @@
fixed-address poolcounter2002.codfw.wmnet;
}
-host puppetcompiler1001 {
- hardware ethernet aa:00:00:25:33:57;
- fixed-address puppetcompiler1001.eqiad.wmnet;
- option pxelinux.pathprefix "stretch-installer/";
- filename "stretch-installer/debian-installer/amd64/pxelinux.0";
-}
-
# ganeti VMs used for pybal testing/development
host pybal-test2001 {
hardware ethernet aa:00:00:16:8d:f9;
--
To view, visit https://gerrit.wikimedia.org/r/404517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If7b5cb40680573836c599906b7fc905fb6c03ab5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Herron <[email protected]>
Gerrit-Reviewer: Herron <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
