Update network configuration for Amsterdam

diff --git a/cookbooks/bind/templates/default/db.10.erb b/cookbooks/bind/templates/default/db.10.erb
index ce6c0a05e6ebdcc7618e2e0b71de24a1443c1cd7..e70fe52b1268ddd05b47d80f038f3556527565ae 100644 (file)
--- a/cookbooks/bind/templates/default/db.10.erb
+++ b/cookbooks/bind/templates/default/db.10.erb
@@ -82,27 +82,27 @@ $TTL        604800
 41.33.0        IN      PTR     thorn-04.oob.openstreetmap.org.
 42.33.0        IN      PTR     thorn-05.oob.openstreetmap.org.
 
-1.48.0 IN      PTR     dulcy.ams.openstreetmap.org.
-2.48.0 IN      PTR     ironbelly.ams.openstreetmap.org.
 3.48.0 IN      PTR     orm.ams.openstreetmap.org.
 4.48.0 IN      PTR     ouroboros.ams.openstreetmap.org.
 5.48.0 IN      PTR     ramoth.ams.openstreetmap.org.
 6.48.0 IN      PTR     spike-01.ams.openstreetmap.org.
 7.48.0 IN      PTR     spike-02.ams.openstreetmap.org.
 8.48.0 IN      PTR     spike-03.ams.openstreetmap.org.
+9.48.0 IN      PTR     dulcy.ams.openstreetmap.org.
+10.48.0        IN      PTR     ironbelly.ams.openstreetmap.org.
 50.48.0        IN      PTR     karm.ams.openstreetmap.org.
 51.48.0        IN      PTR     thorn-01.ams.openstreetmap.org.
 52.48.0        IN      PTR     thorn-02.ams.openstreetmap.org.
 53.48.0        IN      PTR     thorn-03.ams.openstreetmap.org.
 
-1.49.0 IN      PTR     dulcy.oob.openstreetmap.org.
-2.49.0 IN      PTR     ironbelly.oob.openstreetmap.org.
 3.49.0 IN      PTR     orm.oob.openstreetmap.org.
 4.49.0 IN      PTR     ouroboros.oob.openstreetmap.org.
 5.49.0 IN      PTR     ramoth.oob.openstreetmap.org.
 6.49.0 IN      PTR     spike-01.oob.openstreetmap.org.
 7.49.0 IN      PTR     spike-02.oob.openstreetmap.org.
 8.49.0 IN      PTR     spike-03.oob.openstreetmap.org.
+9.49.0 IN      PTR     dulcy.oob.openstreetmap.org.
+10.49.0        IN      PTR     ironbelly.oob.openstreetmap.org.
 50.49.0        IN      PTR     karm.oob.openstreetmap.org.
 51.49.0        IN      PTR     thorn-01.oob.openstreetmap.org.
 52.49.0        IN      PTR     thorn-02.oob.openstreetmap.org.

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index f444ded4442a54e4dc67360a13fd5f58cb82b363..0684875df40d631656d664508c85862ab30dd31d 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -14,17 +14,17 @@ default_attributes(
         }
       },
       :external_ipv4 => {
-        :interface => "bond0.3",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "130.117.76.1"
+        :address => "130.117.76.9"
       },
-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1001"
-      # }
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:9"
+      }
     }
   },
   :postgresql => {

diff --git a/roles/equinix.rb b/roles/equinix.rb
index 114ab906f9ac120be0d7cd28abf70f1395ad6a1a..85d445dce565c148ef948fe665d23b4557d20afb 100644 (file)
--- a/roles/equinix.rb
+++ b/roles/equinix.rb
@@ -8,18 +8,18 @@ default_attributes(
       :internal => {
         :inet => {
           :prefix => "20",
-          :gateway => "10.0.48.2"
+          :gateway => "10.0.48.10"
         }
       },
       :external => {
         :zone => "ams",
         :inet => {
           :prefix => "27",
-          :gateway => "130.117.76.30"
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
           :prefix => "64",
-          :gateway => "2001:978:2:2C::172:2"
+          :gateway => "2001:978:2:2C::172:1"
         }
       }
     }

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 988d636eb7fd9c6f68f99d1fed04286300499870..cde5fb78ce1627542a4f37c4015e2e4bc62c08a0 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -28,23 +28,23 @@ default_attributes(
         :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "10.0.48.2",
+        :address => "10.0.48.10",
         :bond => {
           :slaves => %w[eth0 eth1]
         }
       },
       :external_ipv4 => {
-        :interface => "bond0.3",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "130.117.76.2"
+        :address => "130.117.76.10"
       },
-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1002"
-      # }
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:A"
+      }
     }
   },
   :openvpn => {

diff --git a/roles/orm.rb b/roles/orm.rb
index 99bc7b2b156084329a02c59d42429aa26b384ddd..091ef6ec80e523d6e97c4c47064d5cbef3b484c4 100644 (file)
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -41,17 +41,17 @@ default_attributes(
         }
       },
       :external_ipv4 => {
-        :interface => "bond0.3",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
         :address => "130.117.76.3"
       },
-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1003"
-      # },
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:3"
+      }
     }
   },
   :postgresql => {

diff --git a/roles/ouroboros.rb b/roles/ouroboros.rb
index 288daee192222463edf2539cb2f5dfc81d7b4752..abf757d9d5fdaeea6c57da356ba03a4810636b9c 100644 (file)
--- a/roles/ouroboros.rb
+++ b/roles/ouroboros.rb
@@ -14,17 +14,17 @@ default_attributes(
         }
       },
       :external_ipv4 => {
-        :interface => "bond0.3",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
         :address => "130.117.76.4"
       },
-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1004"
-      # }
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:4"
+      }
     }
   }
 )

diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index 05fcf144acd077c04250038911c31d20cb405864..3bfc653d8331c20d0fec0a7774f774d690066406 100644 (file)
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -14,17 +14,17 @@ default_attributes(
         }
       },
       :external_ipv4 => {
-        :interface => "bond0.3",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
         :address => "130.117.76.6"
       },
-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1006"
-      # }
+      :external_ipv6 => {
+        :interface => "bond0.3",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:6"
+      }
     }
   },
   :sysctl => {

diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index e0d03d2202aa5117e6ecb1567438d1038e7aa978..04461b71fb2020336a3ecc29e11e6a7530e8d26a 100644 (file)
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -14,17 +14,17 @@ default_attributes(
         }
       },
       :external_ipv4 => {
-        :interface => "bond0.3",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
         :address => "130.117.76.7"
       },
-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1007"
-      # }
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:7"
+      }
     }
   },
   :sysctl => {

diff --git a/roles/spike-03.rb b/roles/spike-03.rb
index d4f9e208c0c35b484c65a771c35bb7ab9135cd05..48aafcf1d9570ffb6f7147e60cd3326d8a4960ff 100644 (file)
--- a/roles/spike-03.rb
+++ b/roles/spike-03.rb
@@ -14,17 +14,17 @@ default_attributes(
         }
       },
       :external_ipv4 => {
-        :interface => "bond0.3",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
         :address => "130.117.76.8"
       },
-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1008"
-      # }
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:8"
+      }
     }
   },
   :sysctl => {