Merge pull request #308 from Firefishy/more-404-tiles

[chef.git] / roles / orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index 9f2694fe63901a547170b8c33d53d1818ad4dd57..20abc51aae18339c7aedc0aad3136feb6e1bb3aa 100644 (file)
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -3,17 +3,6 @@ description "Master role applied to orm"
 
 default_attributes(
   :devices => {
 
 default_attributes(
   :devices => {

-    :ssd_samsung => {
-      :comment => "Tune scheduler for SSD",
-      :type => "block",
-      :bus => "ata",
-      :serial => "Samsung_SSD_840_PRO_Series_*",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256",
-        "queue/read_ahead_kb" => "2048"
-      }
-    },

     :arecavoltune => {
       :comment => "Tune scheduler for Areca",
       :type => "block",
     :arecavoltune => {
       :comment => "Tune scheduler for Areca",
       :type => "block",


@@ -26,84 +15,49 @@ default_attributes(
       }
     }
   },
       }
     }
   },

-  :munin => {
-    :plugins => {
-      :ipmi_fans => {
-        :Sys6 => { :graph => "no" },
-        :Sys8 => { :graph => "no" }
-      },
-      :sensors_fan => {
-        :fan3 => { :graph => "no" },
-        :fan4 => { :graph => "no" },
-        :fan5 => { :graph => "no" },
-        :fan6 => { :graph => "no" },
-        :fan7 => { :graph => "no" },
-        :fan8 => { :graph => "no" },
-        :fan9 => { :graph => "no" },
-        :fan10 => { :graph => "no" },
-        :fan11 => { :graph => "no" },
-        :fan12 => { :graph => "no" }
-      },
-      :sensors_volt => {
-        :contacts => "null",
-      }
-    }
-  },

   :networking => {
     :interfaces => {
   :networking => {
     :interfaces => {

+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.3",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
+      },

       :external_ipv4 => {
       :external_ipv4 => {

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

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "193.63.75.98"
+        :address => "130.117.76.3"

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

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

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

-        :address => "2001:630:12:500:2e0:81ff:fec5:2a8c"
-      }
-    }
-  },
-  :postgresql => {
-    :versions => [ "9.1" ],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
-        :effective_cache_size => "16GB"
+        :address => "2001:978:2:2C::172:3"

       }
     }
   },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
       }
     }
   },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",

-      :parameters => { 
+      :parameters => {

         "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
         "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
       }
     }
         "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
         "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
       }
     }

-  },
-  :tile => {
-    :node_file => "/store/database/nodes",
-    :styles => {
-      :default => {
-        :tile_directories => [
-          { :name => "/store/tiles/default-low", :min_zoom => 0, :max_zoom => 17 },
-          { :name => "/store/tiles/default-high", :min_zoom => 18, :max_zoom => 19 }
-        ]
-      }
-    }

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

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

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ic]",
-  "role[tile]"
+  "role[equinix]",
+  "role[tyan-s7010]"

 )
 )