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

[chef.git] / roles / paulla.rb

diff --git a/roles/paulla.rb b/roles/paulla.rb
index 16da1085206183a22d26683772e92329c6c9cce5..516546968c35a112d77e8ae2ef41a2206efeb0bf 100644 (file)
--- a/roles/paulla.rb
+++ b/roles/paulla.rb
@@ -8,22 +8,19 @@ default_attributes(
       :jpcw => { :status => :administrator }
     }
   },
+  :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"
-      }
-    }
+    :allow => ["10.64.1.11"]
   }
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["10.64.1.42", "194.167.156.13", "10.64.1.3"]
+  },
   :ntp => {
-    :servers => [ "cannelle.paulla.asso.fr" ]
+    :servers => ["cannelle.paulla.asso.fr"]
   }
 )