Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129108
Change subject: remove nfs2 from ldap and base config
......................................................................
remove nfs2 from ldap and base config
decom per
RT #7341
Change-Id: I650d5dc2fe35d0742cfaeb11cdd1d241fef49e82
---
M modules/base/manifests/init.pp
M modules/ldap/manifests/role/config.pp
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/129108/1
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 74087ee..b6b5c73 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -257,7 +257,6 @@
class base::remote-syslog {
if ($::lsbdistid == 'Ubuntu') and
($::hostname != 'nfs1') and
- ($::hostname != 'nfs2') and
($::hostname != 'aluminium') and
($::instancename != 'deployment-bastion') {
diff --git a/modules/ldap/manifests/role/config.pp
b/modules/ldap/manifests/role/config.pp
index 29ded25..d700e74 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', 'nfs2.pmtpa.wmnet' ],
- 'eqiad' => [ 'nfs2.pmtpa.wmnet', 'nfs1.pmtpa.wmnet' ],
+ 'pmtpa' => [ 'nfs1.pmtpa.wmnet' ],
+ 'eqiad' => [ 'nfs1.pmtpa.wmnet' ],
}
$sudobasedn = "ou=sudoers,${basedn}"
$ldapconfig = {
--
To view, visit https://gerrit.wikimedia.org/r/129108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I650d5dc2fe35d0742cfaeb11cdd1d241fef49e82
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
