Use SotM 2013 container and rename jekyll recipe to container

[chef.git] / roles / paulla.rb

diff --git a/roles/paulla.rb b/roles/paulla.rb
index b84b86c96ca6d91f046a5e84b423b2f604b8d16a..516546968c35a112d77e8ae2ef41a2206efeb0bf 100644 (file)
--- a/roles/paulla.rb
+++ b/roles/paulla.rb
@@ -12,18 +12,13 @@ default_attributes(
   :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"
-      }
-    }
   }
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["10.64.1.42", "194.167.156.13", "10.64.1.3"]
+  },
   :ntp => {
     :servers => ["cannelle.paulla.asso.fr"]
   }