Bump cookstyle from 6.19.11 to 6.20.1

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index 1968df0945793a2ca3280ba4a372e8e7e9a9797e..238e403ae90f54ffd6174a20772a5a7b236b2f25 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -4,49 +4,63 @@ description "Master role applied to odin"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
+      :internal_ipv4 => {

         :interface => "bond0",
         :interface => "bond0",

-        :role => :external,
+        :role => :internal,

         :family => :inet,
         :family => :inet,

-        :address => "130.225.254.123",
-        :prefix => "23",
-        :gateway => "130.225.254.97",
+        :address => "10.0.48.15",

         :bond => {
         :bond => {

-          :mode => "802.3ad",
-          :miimon => "100",
-          :xmithashpolicy => "layer3+4",
-          :lacprate => "fast",

           :slaves => %w[eno1 eno2]
         }
       },
           :slaves => %w[eno1 eno2]
         }
       },

+      :external_ipv4 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet,
+        :address => "130.117.76.15"
+      },

       :external_ipv6 => {
       :external_ipv6 => {

-        :interface => "bond0",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet6,
         :role => :external,
         :family => :inet6,

-        :address => "2001:878:346::123",
-        :prefix => "64",
-        :gateway => "2001:878:346::97"
+        :address => "2001:978:2:2C::172:F"

       }
     }
   },
       }
     }
   },

-  :squid => {
-    :version => "3",
-    :cache_mem => "14000 MB",
-    :cache_dir => "rock /store/squid/rock-01 128000 slot-size=4096 max-size=262144"
+  :postgresql => {
+    :settings => {
+      :defaults => {
+        :shared_buffers => "8GB",
+        :maintenance_work_mem => "7144MB",
+        :effective_cache_size => "16GB"
+      }
+    }

   },
   },

-  :tilecache => {
-    :tile_parent => "aalborg.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
+  :sysctl => {
+    :postgres => {
+      :comment => "Increase shared memory for postgres",
+      :parameters => {
+        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
+      }
+    }
+  },
+  :tile => {
+    :database => {
+      :cluster => "12/main",
+      :postgis => "3"
+    },
+    :styles => {
+      :default => {
+        :tile_directories => [
+          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
+        ]
+      }
+    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[dotsrc]",
-  "role[tilecache]"
+  "role[equinix]",
+  "role[tile]"

 )
 )