Dzahn has submitted this change and it was merged.
Change subject: decom ekrem, former irc box
......................................................................
decom ekrem, former irc box
remove it from site.pp, dsh, dhcp, install server
Change-Id: I2b3c8890a429fe10cf341cb4552890c3d41295df
---
M files/dsh/group/misc_pmtpa
M manifests/site.pp
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
4 files changed, 0 insertions(+), 12 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/files/dsh/group/misc_pmtpa b/files/dsh/group/misc_pmtpa
index 553064f..07c508e 100644
--- a/files/dsh/group/misc_pmtpa
+++ b/files/dsh/group/misc_pmtpa
@@ -1,5 +1,4 @@
dobson
-ekrem
fenari
linne
manutius
diff --git a/manifests/site.pp b/manifests/site.pp
index f6d9af8..2022cf0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -976,11 +976,6 @@
include role::authdns::ns2
}
-node 'ekrem.wikimedia.org' {
- include admin
- include standard
-}
-
node 'tarin.pmtpa.wmnet' {
$ganglia_aggregator = true
include admin
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index 2b4b5c6..c3a4ba3 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -53,7 +53,6 @@
lead) echo partman/raid1-lvm.cfg ;; \
lvs[1-6]|lvs100*) echo partman/lvs.cfg ;; \
lvs[34]00*) echo partman/raid1-lvm.cfg ;; \
- ekrem) echo partman/raid1.cfg ;; \
eeden) echo partman/raid1-1partition.cfg ;; \
elastic100[0-9]|elastic101[0-9]) echo partman/elasticsearch.cfg
;; \
iodine) echo partman/raid1-1partition.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 0d5e3fa..b95fb50 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1117,11 +1117,6 @@
fixed-address eeden.esams.wikimedia.org;
}
-host ekrem {
- hardware ethernet 84:2b:2b:06:49:30;
- fixed-address ekrem.wikimedia.org;
-}
-
host elastic1001 {
hardware ethernet d4:ae:52:6e:e3:32;
fixed-address elastic1001.eqiad.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/138608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b3c8890a429fe10cf341cb4552890c3d41295df
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
