split configuration in two, include new templates

[chef.git] / roles / grifon.rb

diff --git a/roles/grifon.rb b/roles/grifon.rb
index 85062bbe7786316d50765e1b48462da50d946e5c..e7bf0b295a5e297b12e5ed9a0ad1eb67ed4b9497 100644 (file)
--- a/roles/grifon.rb
+++ b/roles/grifon.rb
@@ -10,7 +10,7 @@ default_attributes(
     }
   },
   :hosted_by => "Grifon",
-  :location => "Paris, France",
+  :location => "Rennes, France",
   :munin => {
     :allow => ["2a00:5884::8"]
   },
@@ -28,12 +28,6 @@ default_attributes(
           :connection_limit => "-"
         }
       ]
-    },
-    :nameservers => ["2a00:5884::7", "8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "grf"
-      }
     }
   }
 )