Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162139
Change subject: Switch ldap servers.
......................................................................
Switch ldap servers.
Rename virt1000 to ldap-eqiad, and switch from virt0 to ldap-codfw
Change-Id: I5a4450e49f5bb58c3668f675cb0359af2d5dac19
---
M modules/base/manifests/init.pp
M modules/ldap/manifests/role/config.pp
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/162139/1
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index a103283..0436241 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -207,6 +207,7 @@
'labs' => $::site ? {
'pmtpa' => 'virt0.wikimedia.org',
'eqiad' => 'virt1000.wikimedia.org',
+ 'codfw' => 'virt1000.wikimedia.org',
},
default => 'puppet',
},
diff --git a/modules/ldap/manifests/role/config.pp
b/modules/ldap/manifests/role/config.pp
index 407e526..56cc0a3 100644
--- a/modules/ldap/manifests/role/config.pp
+++ b/modules/ldap/manifests/role/config.pp
@@ -3,9 +3,8 @@
$basedn = 'dc=wikimedia,dc=org'
$servernames = $site ? {
- 'pmtpa' => [ 'virt0.wikimedia.org', 'virt1000.wikimedia.org' ],
- 'eqiad' => [ 'virt1000.wikimedia.org', 'virt0.wikimedia.org' ],
- 'codfw' => [ 'labcontrol2001.wikimedia.org', 'virt1000.wikimedia.org'
],
+ 'eqiad' => [ 'ldap-eqiad.wikimedia.org', 'ldap-codfw.wikimedia.org' ],
+ 'codfw' => [ 'ldap-codfw.wikimedia.org', 'ldap-eqiad.wikimedia.org' ],
}
$sudobasedn = $::realm ? {
'labs' =>
"ou=sudoers,cn=${instanceproject},ou=projects,${basedn}",
@@ -25,7 +24,7 @@
'script_user_pass' => $passwords::ldap::labs::script_user_pass,
'user_id_attribute' => 'uid',
'tenant_id_attribute' => 'cn',
- 'ca' => 'Equifax_Secure_CA.pem',
+ 'ca' => 'GlobalSign_CA.pem',
'wikildapdomain' => 'labs',
'wikicontrollerapiurl' => 'https://wikitech.wikimedia.org/w/api.php',
'sudobasedn' => $sudobasedn,
--
To view, visit https://gerrit.wikimedia.org/r/162139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a4450e49f5bb58c3668f675cb0359af2d5dac19
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
