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

[chef.git] / roles / firefishynet.rb

diff --git a/roles/firefishynet.rb b/roles/firefishynet.rb
index c1ca2e92d1154fe883114f278e998f22a7c9e2da..150f62d6fe089ac38531387faa55facabee017ad 100644 (file)
--- a/roles/firefishynet.rb
+++ b/roles/firefishynet.rb
@@ -3,16 +3,12 @@ description "Role applied to all servers at Firefishy"
 
 default_attributes(
   :networking => {
 
 default_attributes(
   :networking => {

-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],

     :roles => {
       :internal => {
         :inet => {
           :prefix => "24",
           :gateway => "10.89.121.1"
         }
     :roles => {
       :internal => {
         :inet => {
           :prefix => "24",
           :gateway => "10.89.121.1"
         }

-      },
-      :external => {
-        :zone => "ff"

       }
     }
   }
       }
     }
   }