Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/163141

Change subject: Setup ldap client in bast1001
......................................................................

Setup ldap client in bast1001

With this, silver (according to puppet, at least) has no
more functions, and can be decomissioned

Change-Id: I68c9cd9c4e636d4ca98f12f619edfaffe7462657
---
M manifests/site.pp
M modules/admin/README
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/163141/1

diff --git a/manifests/site.pp b/manifests/site.pp
index bdc398f..12748de 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -354,7 +354,8 @@
     class { 'admin':
         groups => ['deployment',
                    'restricted',
-                   'bastiononly'],
+                   'bastiononly',
+                   'ldap-admins'],
     }
 
 
@@ -362,6 +363,7 @@
     include nfs::netapp::home::othersite
     include misc::dsh
     include ssh::hostkeys-collect
+    include ldap::role::client::labs
 }
 
 node 'bast2001.wikimedia.org' {
@@ -2674,9 +2676,7 @@
 }
 
 node 'silver.wikimedia.org' {
-    class { 'admin': groups => ['ldap-admins'] }
     include standard
-    include ldap::role::client::labs
 }
 
 node 'sodium.wikimedia.org' {
diff --git a/modules/admin/README b/modules/admin/README
index 2d8bfd7..98b2420 100644
--- a/modules/admin/README
+++ b/modules/admin/README
@@ -56,7 +56,7 @@
 
 # NOTE: To choose the UID for a new user please lookup
 # the existing UID in (labs) LDAP and use that.
-# currently you do this on silver, example:
+# currently you do this on bast1001, example:
 #
 # ldaplist -l passwd someuser
 # ...

-- 
To view, visit https://gerrit.wikimedia.org/r/163141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68c9cd9c4e636d4ca98f12f619edfaffe7462657
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to