Improve blackholing of AWS routes on he.net

[chef.git] / roles / snap-01.rb

diff --git a/roles/snap-01.rb b/roles/snap-01.rb
index 1935e753d7fe33a73b536ea1afe06e7e73078912..e741e2d51a45f3a3bb4ab39bf0acc3ea709ed5e0 100644 (file)
--- a/roles/snap-01.rb
+++ b/roles/snap-01.rb
@@ -4,11 +4,10 @@ description "Master role applied to snap-01"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
-        :interface => "bond0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.49",
+      :internal => {
+        :inet => {
+          :address => "10.0.48.49"
+        },

         :bond => {
           :slaves => %w[eno1 eno2 eno3 eno4]
         }
         :bond => {
           :slaves => %w[eno1 eno2 eno3 eno4]
         }


@@ -21,9 +20,7 @@ default_attributes(
         :shared_buffers => "128GB",
         :work_mem => "128MB",
         :maintenance_work_mem => "2GB",
         :shared_buffers => "128GB",
         :work_mem => "128MB",
         :maintenance_work_mem => "2GB",

-        :effective_cache_size => "360GB",
-        :effective_io_concurrency => "256",
-        :random_page_cost => "1.1"
+        :effective_cache_size => "360GB"

       }
     }
   },
       }
     }
   },


@@ -39,7 +36,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix]",
+  "role[equinix-ams]",

   "role[db-master]",
   "role[db-backup]"
 )
   "role[db-master]",
   "role[db-backup]"
 )