Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Remove plutonium from infrastructure
......................................................................
Remove plutonium from infrastructure
Going for reclaiming to spares, removed from:
* site.pp
* netboot
* DHCP
* ferm rules
Bug: T118586
Change-Id: Icf8b4fbc835787db59507ce5c2c96242779f3355
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/manifests/openldap/corp.pp
4 files changed, 3 insertions(+), 8 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 826906a..4498e2b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2192,7 +2192,7 @@
}
# LDAP servers relied on by OIT for mail
-node /(plutonium|pollux|dubnium)\.wikimedia\.org/ {
+node /(dubnium|pollux)\.wikimedia\.org/ {
$cluster = 'openldap_corp_mirror'
role openldap::corp
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index fee1014..c4457b5 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -110,7 +110,7 @@
mw1259|mw1260) echo partman/raid1-1partition.cfg ;; \
mw[0-9]*|osmium|rcs[0-9]*) echo partman/mw.cfg ;; \
mx1001|mx2001) echo partman/flat.cfg virtual.cfg ;; \
-
labservices1001|nembus|neptunium|nickel|plutonium|protactinium|radium|scandium|silver|uranium)
echo partman/raid1.cfg ;; \
+
labservices1001|nembus|neptunium|nickel|protactinium|radium|scandium|silver|uranium)
echo partman/raid1.cfg ;; \
rdb100[7-8]) echo partman/raid1.cfg ;; \
osm-cp*) echo partman/mw.cfg ;; \
pc100[1-3]) echo partman/mw.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 634fa02..80e6a6a 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5988,11 +5988,6 @@
fixed-address palladium.eqiad.wmnet;
}
-host plutonium {
- hardware ethernet 84:2b:2b:fd:b9:ff;
- fixed-address plutonium.wikimedia.org;
-}
-
host potassium {
hardware ethernet 78:2b:cb:08:ac:78;
fixed-address potassium.eqiad.wmnet;
diff --git a/modules/role/manifests/openldap/corp.pp
b/modules/role/manifests/openldap/corp.pp
index 4c90392..063222a 100644
--- a/modules/role/manifests/openldap/corp.pp
+++ b/modules/role/manifests/openldap/corp.pp
@@ -32,7 +32,7 @@
ferm::service { 'corp_ldap':
proto => 'tcp',
port => '389', # Yes, explicitly not supporting LDAPS (port 636)
- srange => '@resolve((plutonium.wikimedia.org dubnium.wikimedia.org
pollux.wikimedia.org mx1001.wikimedia.org mx2001.wikimedia.org))',
+ srange => '@resolve((dubnium.wikimedia.org pollux.wikimedia.org
mx1001.wikimedia.org mx2001.wikimedia.org))',
}
monitoring::service { 'corp_ldap_mirror':
--
To view, visit https://gerrit.wikimedia.org/r/252968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf8b4fbc835787db59507ce5c2c96242779f3355
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
