RobH has submitted this change and it was merged.
Change subject: cleaning out holmium entries
......................................................................
cleaning out holmium entries
death to the old blog server
T84263
Change-Id: I549ec19181d35e63bdcd90687d66ecf39273341f
---
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(+), 24 deletions(-)
Approvals:
RobH: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index ec444a1..c7554d6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1232,24 +1232,6 @@
include role::backup::storage
}
-# old blog server; currently left unpuppetized until it dies off
-node 'holmium.wikimedia.org' {
-
- include role::backup::host
- backup::set {'srv-org-wikimedia-blog':}
-
- include admin
- include base::firewall
-
- # allow HTTP access to WMF OIT
- ferm::rule { 'blog-http':
- rule => 'proto tcp dport (http https) saddr 198.73.209.0/24 ACCEPT;'
- }
-
- include standard
-
-}
-
node 'hooft.esams.wikimedia.org' {
$ganglia_aggregator = true
$domain_search = [
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index b61dc30..df32b63 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -60,7 +60,7 @@
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 ;; \
cp1008) echo partman/raid1-varnish.cfg ;; \
d-i-test) echo partman/flat.cfg ;; \
-
antimony|arsenic|caesium|erbium|gadolinium|heze|holmium|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium)
echo partman/lvm.cfg ;; \
+
antimony|arsenic|caesium|erbium|gadolinium|heze|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium)
echo partman/lvm.cfg ;; \
graphite[12]00*) echo partman/lvm.cfg ;; \
lvs[1-6]|lvs[12]00*) echo partman/flat.cfg ;; \
lvs[34]00*) echo partman/raid1-lvm.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 b1f0f38..1c09626 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1706,11 +1706,6 @@
fixed-address heze.codfw.wmnet;
}
-host holmium {
- hardware ethernet 90:B1:1C:00:A1:0E;
- fixed-address holmium.wikimedia.org;
-}
-
host hooft {
hardware ethernet a4:ba:db:30:d7:70;
fixed-address hooft.esams.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/186357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I549ec19181d35e63bdcd90687d66ecf39273341f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
