Imagery - make mapserv upstart restart safe

[chef.git] / roles / gorynych.rb

diff --git a/roles/gorynych.rb b/roles/gorynych.rb
index d90e42c5aca43d2526b38b3e8636cd77e2258b1b..101e9d083004ed7dad10902809e03bf49cc6b3ba 100644 (file)
--- a/roles/gorynych.rb
+++ b/roles/gorynych.rb
@@ -2,6 +2,16 @@ name "gorynych"
 description "Master role applied to gorynych"
 
 default_attributes(
+  :munin => {
+    :plugins => {
+      :smart_sdc => {
+        :smartctl_exit_status => { :warning => ":8" }
+      },
+      :smart_sdd => {
+        :smartctl_exit_status => { :warning => ":8" }
+      }
+    }
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -11,6 +21,14 @@ default_attributes(
         :address => "130.193.62.73",
         :prefix => "29",
         :gateway => "130.193.62.78"
+      },
+      :external_ipv6 => {
+        :interface => "eth1",
+        :role => :external,
+        :family => :inet6,
+        :address => "2a02:6b8:b010:5065::a001",
+        :prefix => "64",
+        :gateway => "2a02:6b8:b010:5065::1"
       }
     }
   },
@@ -32,7 +50,8 @@ default_attributes(
     :tile_siblings => [
       "trogdor.openstreetmap.org",
       "fume.openstreetmap.org",
-      "tabaluga.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
       "nepomuk.openstreetmap.org",
       "ridgeback.openstreetmap.org"
     ]