imagery: increase randomise delay on mapserver restart

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 7b06247525ba718d57c0445ac17943cf50424e21..8f23bd5d02a806ddcb5d0a385d64a48fdeffb7f6 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -16,7 +16,6 @@ default_attributes(
         }
       },
       :external => {
         }
       },
       :external => {

-        :zone => "bm",

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


@@ -27,17 +26,12 @@ default_attributes(
         }
       }
     }
         }
       }
     }

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

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

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

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