Merge remote-tracking branch 'github/pull/697'

[chef.git] / roles / paulla.rb

diff --git a/roles/paulla.rb b/roles/paulla.rb
index db4252d5d6d0cbfaa5724447597824a9c1c8ecca..1fad914b4d09e2cccc6811511e33efe5b62c4480 100644 (file)
--- a/roles/paulla.rb
+++ b/roles/paulla.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 name "paulla"
 description "Role applied to all servers at PauLLA"
 
@@ -10,21 +9,13 @@ default_attributes(
     }
   },
   :hosted_by => "Université de Pau et des Pays de l'Adour",
-  :location => "Pau, France",
-  :munin => {
-    :allow => ["10.64.1.11"]
-  },
-  :networking => {
-    :nameservers => ["10.64.1.42", "194.167.156.13", "10.64.1.3"],
-    :roles => {
-      :external => {
-        :zone => "pa"
-      }
-    }
-  }
+  :location => "Pau, France"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["10.64.1.42", "194.167.156.13", "10.64.1.3"]
+  },
   :ntp => {
     :servers => ["cannelle.paulla.asso.fr"]
   }