add .envrc

[metasearch/grid-chef-repo.git] / roles / pleiades-nm.rb

diff --git a/roles/pleiades-nm.rb b/roles/pleiades-nm.rb
index 35437f5..7f75dce 100644 (file)
--- a/roles/pleiades-nm.rb
+++ b/roles/pleiades-nm.rb
@@ -1,5 +1,21 @@
-$LOAD_PATH.push("#{File.dirname(__FILE__)}/../_lib")
-#${chef-repo}/_lib/grid.rb
+#
+# Copyright 2013-2014, whitestar
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$LOAD_PATH.push("#{File.dirname(__FILE__)}/_lib")
+#${chef-repo}/roles/_lib/grid.rb
 require 'grid'
 
 name 'pleiades-nm'
@@ -7,7 +23,7 @@ description 'Pleiades nagios node'
 
 run_list(
   'role[node_commons]',
-  'role[grid-realm]',
+  'role[nameservice-client-grid]',
   'role[ganglia-gmond]',
   'role[nagios]'
 )
@@ -151,11 +167,6 @@ nagios_objects = {
       'contact_groups' => 'grid-admins',
     },
     {
-      'use' => 'generic-check_ganglia_cache-service',
-      'hostgroup_name' => 'grid-servers',
-      'contact_groups' => 'grid-admins',
-    },
-    {
       'use' => 'generic-load_one-service',
       'hostgroup_name' => 'grid-servers',
       'contact_groups' => 'grid-admins',