Fix backup expiry script to match prefixes correctly

[chef.git] / roles / bytemark.rb

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

-    :nameservers => ["8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844"],

     :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 => {


@@ -27,13 +29,14 @@ default_attributes(
     }
   },
   :web => {
     }
   },
   :web => {

-    :backends => %w(rails4 rails5),
-    :fileserver => "grisu"
+    :fileserver => "grisu",
+    :readonly_database_host => "snap-02.ucl.openstreetmap.org"

   }
 )
 
 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 => {