Merge remote-tracking branch 'github/pull/358' into master

[chef.git] / roles / ffrl.rb

diff --git a/roles/ffrl.rb b/roles/ffrl.rb
index 6cd12e97a09c5fc1abc01acad77ce7a0a7c77242..96109c4436a4f077b05fc18940e6283740c3c9bd 100644 (file)
--- a/roles/ffrl.rb
+++ b/roles/ffrl.rb
@@ -3,14 +3,7 @@ description "Role applied to all servers at Freifunk Rheinland"
 
 default_attributes(
   :hosted_by => "Freifunk Rheinland",
 
 default_attributes(
   :hosted_by => "Freifunk Rheinland",

-  :location => "Berlin, Germany",
-  :networking => {
-    :roles => {
-      :external => {
-        :zone => "ffr"
-      }
-    }
-  }
+  :location => "Berlin, Germany"

 )
 
 override_attributes(
 )
 
 override_attributes(