X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/dbfe66d5c438af1b566ace0704631f40ae7cc050..743ccc20d107fb66d801138af23752fd6b4fa701:/roles/errol.rb diff --git a/roles/errol.rb b/roles/errol.rb index 74bc999a8..e4db08b80 100644 --- a/roles/errol.rb +++ b/roles/errol.rb @@ -2,23 +2,6 @@ name "errol" description "Master role applied to errol" default_attributes( - :munin => { - :plugins => { - :sensors_fan => { - :contacts => "null" - }, - :sensors_temp => { - :contacts => "null" - }, - :sensors_volt => { - :contacts => "null", - :volt10 => { - :warning => "3.11:3.50", - :critical => "2.98:3.63" - } - } - } - }, :devices => { :osdsk => { :comment => "First os disk", @@ -44,22 +27,23 @@ default_attributes( :networking => { :interfaces => { :internal_ipv4 => { - :interface => "eth0", + :interface => "eth0.2801", :role => :internal, :family => :inet, :address => "10.0.0.14" }, :external_ipv4 => { - :interface => "eth1", + :interface => "eth0.2800", :role => :external, :family => :inet, - :address => "128.40.168.103" + :address => "193.60.236.13" } } } -); +) run_list( - "role[ucl-wates]", + "role[ucl]", + "role[tyan-s7010]", "role[dev]" )