add yarn-installer recipe to the nodejs_utils cookbook.

[metasearch/grid-chef-repo.git] / roles / nameservice-client-grid.rb

diff --git a/roles/nameservice-client-grid.rb b/roles/nameservice-client-grid.rb
index 624be5d..0bdb2da 100644 (file)
--- a/roles/nameservice-client-grid.rb
+++ b/roles/nameservice-client-grid.rb
@@ -2,35 +2,13 @@ name 'nameservice-client-grid'
 description 'The NameService (Kerberos and LDAP) client role for Grid'
 
 run_list(
-  'role[grid-realm]',
-  'role[nameservice-client]'
+  'role[krb5-client-grid]',
+  'role[ldap-client-grid]'
 )
 
-uri = 'ldap://ldap.grid.example.com/'
-base = 'dc=grid,dc=example,dc=com'
-ca_cert_file = '/etc/ssl/certs/cacert.pem'
-
 #env_run_lists "prod" => ["recipe[apache2]"], "staging" => ["recipe[apache2::staging]"], "_default" => []
 
 default_attributes(
-  'openldap' => {
-    'client' => {
-      'URI' => uri,
-      'BASE' => base,
-      'TLS_CACERT' => ca_cert_file,
-      'TLS_REQCERT' => 'allow',
-      'TLS_CHECKPEER' => 'yes',
-      'SASL_MECH' => 'GSSAPI'
-    },
-    'nss-ldapd' => {
-      'uri' => uri,
-      'base' => base,
-      'ssl' => 'start_tls',
-      'tls_cacertfile' => ca_cert_file,
-      'tls_reqcert' => 'demand'
-    },
-    'ldap_lookup_nameservices' => ['passwd', 'group']
-  }
 )
 
 #override_attributes "apache2" => { "max_children" => "50" }