Cmjohnson has submitted this change and it was merged.
Change subject: Removing all lead polonium entries: site.pp entry role is spare
but removing all together, updated smtp hosts to mx1001.wikimedia.org for
hierdata and analytics. bug: task T113962 Change-Id:
I5f75d11723ecdf00734a1f876f82eb12ae7d8b34
......................................................................
Removing all lead polonium entries: site.pp entry role is spare but removing
all together, updated smtp hosts to mx1001.wikimedia.org for hierdata and
analytics. bug: task T113962
Change-Id: I5f75d11723ecdf00734a1f876f82eb12ae7d8b34
---
M hieradata/labs/sentry/common.yaml
M hieradata/role/common/sentry.yaml
M manifests/role/analytics/burrow.pp
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
6 files changed, 4 insertions(+), 25 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/labs/sentry/common.yaml
b/hieradata/labs/sentry/common.yaml
index c1bee0b..da4100d 100644
--- a/hieradata/labs/sentry/common.yaml
+++ b/hieradata/labs/sentry/common.yaml
@@ -1,3 +1,3 @@
sentry::server_name: "%{::sentry_server_name}"
-sentry::smtp_host: 'polonium.wikimedia.org'
+sentry::smtp_host: 'mx1001.wikimedia.org'
sentry::admin_email: 'gti...@wikimedia.org'
diff --git a/hieradata/role/common/sentry.yaml
b/hieradata/role/common/sentry.yaml
index 26e59e3..a021f82 100644
--- a/hieradata/role/common/sentry.yaml
+++ b/hieradata/role/common/sentry.yaml
@@ -1,3 +1,3 @@
sentry::server_name: 'sentry.wikimedia.org'
-sentry::smtp_host: 'polonium.wikimedia.org'
+sentry::smtp_host: 'mx1001.wikimedia.org'
sentry::admin_email: 'gti...@wikimedia.org'
diff --git a/manifests/role/analytics/burrow.pp
b/manifests/role/analytics/burrow.pp
index 248c019..f970d29 100644
--- a/manifests/role/analytics/burrow.pp
+++ b/manifests/role/analytics/burrow.pp
@@ -13,7 +13,7 @@
zookeeper_path =>
$role::analytics::kafka::config::zookeeper_chroot,
kafka_cluster_name =>
$role::analytics::kafka::config::kafka_cluster_name,
kafka_brokers => $role::analytics::kafka::config::brokers_array,
- smtp_server => 'polonium.wikimedia.org',
+ smtp_server => 'mx1001.wikimedia.org',
from_email => "burrow@${::fqdn}",
to_emails => 'madhuvi...@wikimedia.org, o...@wikimedia.org',
}
diff --git a/manifests/site.pp b/manifests/site.pp
index af3ccd8..9958efc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1328,12 +1328,6 @@
role labs::nfs::fileserver
}
-
-node 'lead.wikimedia.org' {
- role spare
- interface::add_ip6_mapped { 'main': }
-}
-
node 'lithium.eqiad.wmnet' {
role backup::host, syslog::centralserver
include standard
@@ -2173,11 +2167,6 @@
role openldap::corp
include standard
-}
-
-node 'polonium.wikimedia.org' {
- role spare
- interface::add_ip6_mapped { 'main': }
}
# careful when moving poolcounters
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 49f02e0..d49623a 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -46,7 +46,7 @@
esac; \
\
case $(debconf-get netcfg/get_hostname) in \
-
acamar|achernar|baham|cobalt|lead|lithium|polonium|radon|rubidium|rhodium) echo
partman/raid1-lvm.cfg ;; \
+ acamar|achernar|baham|cobalt|lithium|radon|rubidium|rhodium)
echo partman/raid1-lvm.cfg ;; \
analytics100[3-9]) echo partman/analytics-cisco.cfg ;; \
analytics1017) echo partman/raid1-30G.cfg ;; \
analytics1015) echo partman/raid1-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 0aded74..897bc58 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2733,11 +2733,6 @@
fixed-address lanthanum.eqiad.wmnet;
}
-host lead {
- hardware ethernet C8:1F:66:BF:71:66;
- fixed-address lead.wikimedia.org;
-}
-
host lithium {
hardware ethernet C8:1F:66:BF:7F:EA;
fixed-address lithium.eqiad.wmnet;
@@ -5996,11 +5991,6 @@
host plutonium {
hardware ethernet 84:2b:2b:fd:b9:ff;
fixed-address plutonium.wikimedia.org;
-}
-
-host polonium {
- hardware ethernet C8:1F:66:BF:8D:D6;
- fixed-address polonium.wikimedia.org;
}
host potassium {
--
To view, visit https://gerrit.wikimedia.org/r/252229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f75d11723ecdf00734a1f876f82eb12ae7d8b34
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson <cmjohn...@wikimedia.org>
Gerrit-Reviewer: Cmjohnson <cmjohn...@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
