coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113967
Change subject: Labs: make a generic "every instance" class
......................................................................
Labs: make a generic "every instance" class
Also disable autofs in eqiad
Change-Id: I5c7150b824e82c2e1d18b6849710b067ae5f2bd8
---
R manifests/role/labstools.pp
M modules/ldap/manifests/role/client.pp
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/113967/1
diff --git a/manifests/role/labs.pp b/manifests/role/labstools.pp
similarity index 96%
rename from manifests/role/labs.pp
rename to manifests/role/labstools.pp
index 5361eb5..e5c622e 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labstools.pp
@@ -1,7 +1,3 @@
-#
-# This is a nice generic place to make project-specific roles with a sane
-# naming scheme.
-#
class role::labs::tools {
diff --git a/modules/ldap/manifests/role/client.pp
b/modules/ldap/manifests/role/client.pp
index 2f13234..d7d1209 100644
--- a/modules/ldap/manifests/role/client.pp
+++ b/modules/ldap/manifests/role/client.pp
@@ -3,7 +3,11 @@
certificates::wmf_ca
if ( $::realm == 'labs' ) {
- $includes = ['openldap', 'pam', 'nss', 'sudo', 'utils', 'autofs',
'access']
+ if( $::site == 'eqiad' ) {
+ $includes = ['openldap', 'pam', 'nss', 'sudo', 'utils', 'autofs',
'access']
+ } else {
+ $includes = ['openldap', 'pam', 'nss', 'sudo', 'utils', 'access']
+ }
include certificates::wmf_labs_ca
} else {
--
To view, visit https://gerrit.wikimedia.org/r/113967
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c7150b824e82c2e1d18b6849710b067ae5f2bd8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <mpellet...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
