Remove old cogent addresses from various ACLs

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index ae57f844bf0d85e831a6e4b630edce24b4ecc255..3aee2928cacc26d263188b71ab5f43a33f1f3f99 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -4,11 +4,12 @@ description "Master role applied to norbert"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.17",
+        :inet => {
+          :address => "10.0.48.17"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -16,19 +17,40 @@ default_attributes(
           :slaves => %w[enp25s0f0 enp25s0f1]
         }
       },
-      :external_ipv4 => {
+      :external_cogent => {
         :interface => "bond0.2",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.17"
+        :metric => 150,
+        :source_route_table => 100,
+        :inet => {
+          :address => "130.117.76.17",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
+        },
+        :inet6 => {
+          :address => "2001:978:2:2c::172:11",
+          :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,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:11"
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.145",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::11",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
-
     }
   },
   :planet => {