From 9f5f7c9759d3bf9bfc2971c10e96c8b8350762bc Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 29 Sep 2014 20:24:35 +0100 Subject: [PATCH] Remove horntail and konqi roles --- roles/horntail.rb | 110 ---------------------------------------------- roles/konqi.rb | 38 ---------------- 2 files changed, 148 deletions(-) delete mode 100644 roles/horntail.rb delete mode 100644 roles/konqi.rb diff --git a/roles/horntail.rb b/roles/horntail.rb deleted file mode 100644 index 3c7292596..000000000 --- a/roles/horntail.rb +++ /dev/null @@ -1,110 +0,0 @@ -name "horntail" -description "Master role applied to horntail" - -default_attributes( - :accounts => { - :users => { - :gravitystorm => { :status => :user } - } - }, - :munin => { - :plugins => { - :ipmi_fans => { - :FAN1 => { :graph => "no" }, - :FAN2 => { :graph => "no" }, - :FAN3 => { :graph => "no" }, - :FAN4 => { :graph => "no" }, - :FAN5 => { :graph => "no" } - }, - :sensors_fan => { - :fan1 => { :graph => "no" }, - :fan2 => { :graph => "no" }, - :fan3 => { :graph => "no" }, - :fan4 => { :graph => "no" }, - :fan5 => { :graph => "no" }, - :fan6 => { :graph => "no" }, - :fan9 => { :graph => "no" }, - :fan10 => { :graph => "no" } - }, - :sensors_volt => { - :contacts => "null", - :volt1 => { - :warning => "1.316:1.484", - :critical => "1.26:1.54" - }, - :volt3 => { - :warning => "1.1:2.0", - :critical => "1.0:3.0" - }, - :volt4 => { - :warning => "11.0:13.0", - :critical => "10.5:13.5" - } - } - } - }, - :networking => { - :interfaces => { - :external_ipv4 => { - :interface => "eth0", - :role => :external, - :family => :inet, - :address => "193.63.75.101" - }, - :external_ipv6 => { - :interface => "eth0", - :role => :external, - :family => :inet6, - :address => "2001:630:12:500:202:b3ff:feec:eeac" - }, - :internal_ipv4 => { - :interface => "eth1", - :role => :internal, - :family => :inet, - :address => "146.179.159.164" - } - } - }, - :rsyncd => { - :modules => { - :hosts => { - :comment => "Host data", - :path => "/home/hosts", - :read_only => true, - :write_only => false, - :list => false, - :uid => "tomh", - :gid => "tomh", - :transfer_logging => false, - :hosts_allow => [ - "212.110.172.32", # shenron - "2001:41c9:1:400::32", # shenron - "212.159.112.221" # grant - ] - }, - :logs => { - :comment => "Log files", - :path => "/store/logs", - :read_only => false, - :write_only => true, - :list => false, - :uid => "www-data", - :gid => "www-data", - :transfer_logging => false, - :hosts_allow => [ - "128.40.168.0/24", # ucl external (wates) - "128.40.45.192/27", # ucl external (wolfson) - "146.179.159.160/27", # ic internal - "193.63.75.96/27", # ic external - "2001:630:12:500::/64", # ic external - "127.0.0.0/8", # localhost - "::1" # localhost - ] - } - } - } -); - -run_list( - "role[ic]" -) diff --git a/roles/konqi.rb b/roles/konqi.rb deleted file mode 100644 index 65105bafb..000000000 --- a/roles/konqi.rb +++ /dev/null @@ -1,38 +0,0 @@ -name "konqi" -description "Master role applied to konqi" - -default_attributes( - :networking => { - :interfaces => { - :external_ipv4 => { - :interface => "eth0", - :role => :external, - :family => :inet, - :address => "193.63.75.104" - }, - :external_ipv4_alias => { - :interface => "eth0:1", - :family => :inet, - :address => "193.63.75.105", - :prefix => "27" - }, - :external_ipv6 => { - :interface => "eth0", - :role => :external, - :family => :inet6, - :address => "2001:630:12:500:215:60ff:feaa:9956" - } - } - } -) - -override_attributes( - :networking => { - :nameservers => [ "8.8.8.8", "8.8.4.4" ], - :search => [ "ic.openstreetmap.org", "openstreetmap.org" ], - } -) - -run_list( - "role[ic]" -) -- 2.43.2