Introduce equinix-ams-public role for servers with public addresses

[chef.git] / roles / vhagar.rb

diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index b5776ab2ad41c8c79dca5add4e32b380e546da1a..c8cd4a92fbf07dbe2c2e37aa2b83927114bc70e5 100644 (file)
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.5"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.133",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.133"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::5",
-          :prefix => 64,
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::5"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.101",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.101"
         },
         :inet6 => {
-          :address => "2001:4d78:500:5e3::5",
-          :prefix => 64,
-          :gateway => "2001:4d78:500:5e3::1"
+          :address => "2001:4d78:500:5e3::5"
         }
       }
     }
@@ -60,6 +40,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[nominatim]"
 )