Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334011 )
Change subject: site.pp, DHCP: remove multatuli
......................................................................
site.pp, DHCP: remove multatuli
Bug: T156208
Change-Id: I9dc852819ac683b973c7ace8500a1abca9769f04
---
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(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/334011/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 8b1f5a0..551fa55 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1958,14 +1958,6 @@
role(otrs::webserver)
}
-node 'multatuli.wikimedia.org' {
- role(spare::system)
-
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
-}
-
# also see dataset1001
node 'ms1001.wikimedia.org' {
$cluster = 'misc'
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 531cb89..61004c1 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -68,7 +68,7 @@
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
echo partman/db.cfg ;; \
d-i-test) echo partman/cassandrahosts-12hdd.cfg ;; \
druid100[123]) echo partman/druid-4ssd-raid10.cfg ;; \
- eeden|maerlant|multatuli|nescio) echo partman/raid1-1partition.cfg ;; \
+ eeden|maerlant|nescio) echo partman/raid1-1partition.cfg ;; \
elastic101[7-9]|elastic102[0-9]|elastic103[0-1]) echo
partman/elasticsearch-raid0.cfg ;; \
elastic103[2-9]|elastic104[0-9]|elastic20[0-2][0-9]|elastic203[0-6])
echo partman/elasticsearch-raid1.cfg ;; \
labmon1001|mwlog[12]001|relforge100[12]|scb200[1-4]) echo
partman/raid10-gpt-srv-lvm-ext4.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 247bb68..62207d7 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -4043,11 +4043,6 @@
fixed-address ms-fe3002.esams.wmnet;
}
-host multatuli {
- hardware ethernet a4:ba:db:30:d5:99;
- fixed-address multatuli.wikimedia.org;
-}
-
host mwlog1001 {
hardware ethernet 14:18:77:33:4A:C0;
fixed-address mwlog1001.eqiad.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/334011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dc852819ac683b973c7ace8500a1abca9769f04
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
