X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/68e068818d559ef35bdf2a138a93596337828ef9..6e1093865fba17dd74be3fe33c3e6f66b2e43065:/roles/fafnir.rb diff --git a/roles/fafnir.rb b/roles/fafnir.rb index 8261d7afd..5734379ae 100644 --- a/roles/fafnir.rb +++ b/roles/fafnir.rb @@ -2,15 +2,11 @@ name "fafnir" description "Master role applied to fafnir" default_attributes( - :bind => { - :clients => "equinix-dub" - }, :dhcpd => { :first_address => "10.0.79.1", :last_address => "10.0.79.254" }, :exim => { - :smarthost_name => "fafnir.openstreetmap.org", :routes => { :openstreetmap => { :comment => "openstreetmap.org", @@ -21,11 +17,12 @@ default_attributes( }, :networking => { :interfaces => { - :internal_ipv4 => { + :internal => { :interface => "bond0", :role => :internal, - :family => :inet, - :address => "10.0.64.2", + :inet => { + :address => "10.0.64.2" + }, :bond => { :mode => "802.3ad", :lacprate => "fast", @@ -33,17 +30,15 @@ default_attributes( :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50] } }, - :external_ipv4 => { + :external => { :interface => "bond0.101", :role => :external, - :family => :inet, - :address => "184.104.226.98" - }, - :external_ipv6 => { - :interface => "bond0.101", - :role => :external, - :family => :inet6, - :address => "2001:470:1:b3b::2" + :inet => { + :address => "184.104.226.98" + }, + :inet6 => { + :address => "2001:470:1:b3b::2" + } } } }, @@ -56,7 +51,7 @@ default_attributes( :metrics => { :uplink_interface => { :help => "Site uplink interface name", - :labels => { :site => "dublin", :name => "ae50" } + :labels => { :site => "dublin", :name => "xe-[01]/2/[01]|ge-[01]/2/2" } } } }