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

[chef.git] / roles / faimaison.rb

diff --git a/roles/faimaison.rb b/roles/faimaison.rb
index 2a87de1605f3b5b98134928382f1c1362bc72d8f..02ca7f35345cbdbe0d6ecb0c2c67a594736a477a 100644 (file)
--- a/roles/faimaison.rb
+++ b/roles/faimaison.rb
@@ -3,19 +3,7 @@ description "Role applied to all servers at FAImaison"
 
 default_attributes(
   :hosted_by => "FAImaison",
 
 default_attributes(
   :hosted_by => "FAImaison",

-  :location => "France",
-  :networking => {
-    :nameservers => [
-      "8.8.8.8",
-      "8.8.4.4",
-      "1.1.1.1"
-    ],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
-  }
+  :location => "France"

 )
 
 override_attributes(
 )
 
 override_attributes(