Alexandros Kosiaris has submitted this change and it was merged.
Change subject: decom nfs1
......................................................................
decom nfs1
remove nfs1 from:
- dsh groups
- site.pp
- DHCP
- base module / rsyslog
- LDAP config (!??) <-- what is replacing it?
please somebody especially look at the LDAP config
part, the TODO and what replaces this here?
# TODO: kill this role at some point
class ldap::role::config::production
does this really mean eqiad uses pmtpa?
'eqiad' => [ 'nfs1.pmtpa.wmnet' ],
RT: 7295
Change-Id: I6989717f02afebffa6e01abf594eda3d0aaf0b34
---
M manifests/site.pp
M modules/base/manifests/init.pp
M modules/dsh/files/group/ALL
M modules/dsh/files/group/pmtpa
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
M modules/ldap/manifests/role/config.pp
6 files changed, 2 insertions(+), 23 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 9d3a624..30b17e2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2264,19 +2264,6 @@
}
}
-node 'nfs1.pmtpa.wmnet' {
-
- $server_bind_ips = "127.0.0.1 ${ipaddress_eth0}"
- $cluster = 'misc'
-
- include admin
- include standard
- include misc::nfs-server::home::rsyncd
- include backup::host
- include role::syslog::centralserver
- backup::set { 'var-opendj-backups': }
-}
-
node 'nickel.wikimedia.org' {
$ganglia_aggregator = true
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 01b54ce..f28a2f6 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -45,7 +45,6 @@
class base::remote-syslog {
if ($::lsbdistid == 'Ubuntu') and
- ($::hostname != 'nfs1') and
($::hostname != 'lithium') and
($::instancename != 'deployment-bastion') {
diff --git a/modules/dsh/files/group/ALL b/modules/dsh/files/group/ALL
index 12620b4..a27f77a 100644
--- a/modules/dsh/files/group/ALL
+++ b/modules/dsh/files/group/ALL
@@ -37,6 +37,5 @@
snapshot1004
dobson
-nfs1
wikitech
civicrm
diff --git a/modules/dsh/files/group/pmtpa b/modules/dsh/files/group/pmtpa
index a458eec..6cdb03a 100644
--- a/modules/dsh/files/group/pmtpa
+++ b/modules/dsh/files/group/pmtpa
@@ -2,4 +2,3 @@
mchenry
sanger
tarin
-nfs1
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
index 3bc1035..95e6001 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
@@ -13,11 +13,6 @@
fixed-address mchenry.wikimedia.org;
}
-host nfs1 {
- hardware ethernet 00:1E:C9:EA:AB:65;
- fixed-address nfs1.pmtpa.wmnet;
-}
-
host sanger {
hardware ethernet 00:19:B9:DD:86:EB;
fixed-address sanger.wikimedia.org;
diff --git a/modules/ldap/manifests/role/config.pp
b/modules/ldap/manifests/role/config.pp
index d48ff00..1f4cea6 100644
--- a/modules/ldap/manifests/role/config.pp
+++ b/modules/ldap/manifests/role/config.pp
@@ -39,8 +39,8 @@
$basedn = 'dc=wikimedia,dc=org'
$servernames = $site ? {
- 'pmtpa' => [ 'nfs1.pmtpa.wmnet' ],
- 'eqiad' => [ 'nfs1.pmtpa.wmnet' ],
+ 'pmtpa' => [ ],
+ 'eqiad' => [ ],
}
$sudobasedn = "ou=sudoers,${basedn}"
$ldapconfig = {
--
To view, visit https://gerrit.wikimedia.org/r/159442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6989717f02afebffa6e01abf594eda3d0aaf0b34
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[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
