Update bundle

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 9f1b4e9bfd1ee87b49fde5d3e94bd6cf78141cb2..8f23bd5d02a806ddcb5d0a385d64a48fdeffb7f6 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -5,16 +5,17 @@ default_attributes(
   :hosted_by => "Bytemark",
   :location => "York, England",
   :networking => {
   :hosted_by => "Bytemark",
   :location => "York, England",
   :networking => {

-    :nameservers => ["80.68.80.24", "80.68.80.25", "2001:41c8:2::1", "2001:41c8:2::2"],

     :roles => {
       :internal => {
         :inet => {
           :prefix => "20",
     :roles => {
       :internal => {
         :inet => {
           :prefix => "20",

-          :gateway => "10.0.32.20"
+          :gateway => "10.0.32.20",
+          :routes => {
+            "10.0.0.0/8" => { :via => "10.0.32.20" }
+          }

         }
       },
       :external => {
         }
       },
       :external => {

-        :zone => "bm",

         :inet => {
           :prefix => "28",
           :gateway => "89.16.162.17"
         :inet => {
           :prefix => "28",
           :gateway => "89.16.162.17"


@@ -25,16 +26,12 @@ default_attributes(
         }
       }
     }
         }
       }
     }

-  },
-  :web => {
-    :backends => %w[rails4 rails5],
-    :fileserver => "grisu",
-    :readonly_database_host => "eddie.bm.openstreetmap.org"

   }
 )
 
 override_attributes(
   :networking => {
   }
 )
 
 override_attributes(
   :networking => {

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

     :search => ["bm.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {
     :search => ["bm.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {