Add he.net addresses to remaining Amsterdam machines

diff --git a/roles/dribble.rb b/roles/dribble.rb
index bef4322048a226668e81a5c76cfd536b4db481d7..cc992c589552e58d77b49cec350a2a228c59fde9 100644 (file)
--- a/roles/dribble.rb
+++ b/roles/dribble.rb
@@ -17,9 +17,10 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external => {
+      :external_cogent => {
         :interface => "bond0.2",
         :role => :external,
+        :source_route_table => 100,
         :inet => {
           :address => "130.117.76.4",
           :prefix => "27",
@@ -33,6 +34,22 @@ default_attributes(
             "2001:470:1:b3b::/64" => { :type => "unreachable" }
           }
         }
+      },
+      :external => {
+        :interface => "bond0.3",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.132",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::4",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
     }
   },

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index c7dda68de19476c044d01f6a519f0917a0d83bb1..0f73d7cc40829f5ba4a38924d7997ae940804826 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -17,9 +17,10 @@ default_attributes(
           :slaves => %w[ens18f0 ens18f1]
         }
       },
-      :external => {
+      :external_cogent => {
         :interface => "bond0.2",
         :role => :external,
+        :source_route_table => 100,
         :inet => {
           :address => "130.117.76.9",
           :prefix => "27",
@@ -33,6 +34,22 @@ default_attributes(
             "2001:470:1:b3b::/64" => { :type => "unreachable" }
           }
         }
+      },
+      :external => {
+        :interface => "bond0.3",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.137",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::9",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
     }
   },

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 016ec8200eca112b29240e72de4c172c5a028945..0c89b199d97a6c425a121851763565c648fd3cd4 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -39,9 +39,10 @@ default_attributes(
           :slaves => %w[eth0 eth1]
         }
       },
-      :external => {
+      :external_cogent => {
         :interface => "bond0.2",
         :role => :external,
+        :source_route_table => 100,
         :inet => {
           :address => "130.117.76.10",
           :prefix => "27",
@@ -55,6 +56,22 @@ default_attributes(
             "2001:470:1:b3b::/64" => { :type => "unreachable" }
           }
         }
+      },
+      :external => {
+        :interface => "bond0.3",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.138",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::a",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
     }
   },

diff --git a/roles/norbert.rb b/roles/norbert.rb
index b492a92861a5cecf57971a2fecc358e5426e7b1f..66140ee604137666d475003a0f67ac24a461d27d 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -17,9 +17,10 @@ default_attributes(
           :slaves => %w[enp25s0f0 enp25s0f1]
         }
       },
-      :external => {
+      :external_cogent => {
         :interface => "bond0.2",
         :role => :external,
+        :source_route_table => 100,
         :inet => {
           :address => "130.117.76.17",
           :prefix => "27",
@@ -33,6 +34,22 @@ default_attributes(
             "2001:470:1:b3b::/64" => { :type => "unreachable" }
           }
         }
+      },
+      :external => {
+        :interface => "bond0.3",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.139",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::11",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
     }
   },

diff --git a/roles/odin.rb b/roles/odin.rb
index 6d29b734c076662f7108610106d4cec4b67f1bea..b835c456dbc62b4c03439a762952c7282a5fcecd 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -17,9 +17,10 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
-      :external => {
+      :external_cogent => {
         :interface => "bond0.2",
         :role => :external,
+        :source_route_table => 100,
         :inet => {
           :address => "130.117.76.15",
           :prefix => "27",
@@ -33,6 +34,22 @@ default_attributes(
             "2001:470:1:b3b::/64" => { :type => "unreachable" }
           }
         }
+      },
+      :external => {
+        :interface => "bond0.3",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.143",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::f",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
     }
   },

diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index 73a3802b16248f5634a32f5c868ae1c431ab7a8e..42345259eb6106f97ee39375a666bcad2741d3a5 100644 (file)
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -17,9 +17,10 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
-      :external => {
+      :external_cogent => {
         :interface => "bond0.2",
         :role => :external,
+        :source_route_table => 100,
         :inet => {
           :address => "130.117.76.11",
           :prefix => "27",
@@ -33,6 +34,22 @@ default_attributes(
             "2001:470:1:b3b::/64" => { :type => "unreachable" }
           }
         }
+      },
+      :external => {
+        :interface => "bond0.3",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.139",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::b",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
     }
   }

diff --git a/roles/spike-07.rb b/roles/spike-07.rb
index b6a5fc0dae8ede586e4217a2701b4b887c4d9539..ad9461e9a7be9a99aaf520821ca43fe043c656d8 100644 (file)
--- a/roles/spike-07.rb
+++ b/roles/spike-07.rb
@@ -17,9 +17,10 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
-      :external => {
+      :external_cogent => {
         :interface => "bond0.2",
         :role => :external,
+        :source_route_table => 100,
         :inet => {
           :address => "130.117.76.12",
           :prefix => "27",
@@ -33,6 +34,22 @@ default_attributes(
             "2001:470:1:b3b::/64" => { :type => "unreachable" }
           }
         }
+      },
+      :external => {
+        :interface => "bond0.3",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.140",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::c",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
     }
   }

diff --git a/roles/spike-08.rb b/roles/spike-08.rb
index c65e0c4c72f328af748e04d8fb8e02fd5d40240e..e73190fc4a3478bfce92bfffd1e463253b725e09 100644 (file)
--- a/roles/spike-08.rb
+++ b/roles/spike-08.rb
@@ -17,9 +17,10 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
-      :external => {
+      :external_cogent => {
         :interface => "bond0.2",
         :role => :external,
+        :source_route_table => 100,
         :inet => {
           :address => "130.117.76.13",
           :prefix => "27",
@@ -33,6 +34,22 @@ default_attributes(
             "2001:470:1:b3b::/64" => { :type => "unreachable" }
           }
         }
+      },
+      :external => {
+        :interface => "bond0.3",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.141",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::d",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
     }
   }

diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index 75ca73bf01e544d977a48012c153b70bff7f514c..df6ad79c3041bbfb4917697e404b38ca4dea6aea 100644 (file)
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -17,9 +17,10 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external => {
+      :external_cogent => {
         :interface => "bond0.2",
         :role => :external,
+        :source_route_table => 100,
         :inet => {
           :address => "130.117.76.5",
           :prefix => "27",
@@ -33,6 +34,22 @@ default_attributes(
             "2001:470:1:b3b::/64" => { :type => "unreachable" }
           }
         }
+      },
+      :external => {
+        :interface => "bond0.3",
+        :role => :external,
+        :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"
+        }
       }
     }
   },