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

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 6e12a87bf9a1aecab42cfad5b6a793ef7b5dbb84..93f652b1dc72a8d27bb8278fd844e76613d0b9d0 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -5,13 +5,14 @@ default_attributes(
   :hosted_by => "Bytemark",
   :location => "York, England",
   :networking => {
   :hosted_by => "Bytemark",
   :location => "York, England",
   :networking => {

-    :netplan => true,
-    :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 => {


@@ -28,7 +29,6 @@ default_attributes(
     }
   },
   :web => {
     }
   },
   :web => {

-    :backends => %w[rails4 rails5],

     :fileserver => "grisu",
     :readonly_database_host => "katla.bm.openstreetmap.org"
   }
     :fileserver => "grisu",
     :readonly_database_host => "katla.bm.openstreetmap.org"
   }


@@ -36,6 +36,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
 
 override_attributes(
   :networking => {

+    :nameservers => ["10.0.32.20"],

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