Move odin's default route to he.net link

[chef.git] / roles / vhagar.rb

diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index 3beb57764cce8240fbcf22c81f1e7813011fc3ca..df6ad79c3041bbfb4917697e404b38ca4dea6aea 100644 (file)
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -4,11 +4,12 @@ description "Master role applied to vhagar"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
+      :internal => {

         :interface => "bond0",
         :role => :internal,
         :interface => "bond0",
         :role => :internal,

-        :family => :inet,
-        :address => "10.0.48.5",
+        :inet => {
+          :address => "10.0.48.5"
+        },

         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",


@@ -16,22 +17,54 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },

-      :external_ipv4 => {
+      :external_cogent => {

         :interface => "bond0.2",
         :role => :external,
         :interface => "bond0.2",
         :role => :external,

-        :family => :inet,
-        :address => "130.117.76.5"
+        :source_route_table => 100,
+        :inet => {
+          :address => "130.117.76.5",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
+        },
+        :inet6 => {
+          :address => "2001:978:2:2c::172:5",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
+        }

       },
       },

-      :external_ipv6 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",

         :role => :external,
         :role => :external,

-        :family => :inet6,
-        :address => "2001:978:2:2C::172:5"
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.133",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::5",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
+      }
+    }
+  },
+  :nominatim => {
+    :state => "standalone",
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :fpm_pools => {
+      "nominatim.openstreetmap.org" => {
+        :max_children => 200

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

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

 )
 )