From: Tom Hughes Date: Wed, 25 Jul 2018 17:01:29 +0000 (+0100) Subject: Update network configuration for Amsterdam X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/545c9ed2ad8d9ee48a8417f8b98485790fafc170 Update network configuration for Amsterdam --- diff --git a/cookbooks/bind/templates/default/db.10.erb b/cookbooks/bind/templates/default/db.10.erb index ce6c0a05e..e70fe52b1 100644 --- 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 f444ded44..0684875df 100644 --- 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 114ab906f..85d445dce 100644 --- 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 988d636eb..cde5fb78c 100644 --- 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 99bc7b2b1..091ef6ec8 100644 --- 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 288daee19..abf757d9d 100644 --- 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 05fcf144a..3bfc653d8 100644 --- 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 e0d03d220..04461b71f 100644 --- 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 d4f9e208c..48aafcf1d 100644 --- 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 => {