Merge remote-tracking branch 'github/pull/670'

[chef.git] / roles / horntail.rb

diff --git a/roles/horntail.rb b/roles/horntail.rb
index 4d39240209292e24ea79d3757946fc9e3de56210..afaf9460d07e3238220b08091618e8e85423ca9c 100644 (file)
--- a/roles/horntail.rb
+++ b/roles/horntail.rb
@@ -2,146 +2,37 @@ 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",
+      :internal => {
+        :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "146.179.159.164"
-      }
-    }
-  },
-  :openvpn => {
-    :address => "10.0.16.2",
-    :tunnels => {
-      :ic2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
+        :inet => {
+          :address => "10.0.64.10"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[enp25s0f0 enp25s0f1]
         }
-      }
-    }
-  },
-  :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 => [ 
-          "89.16.179.150",                       # shenron
-          "2001:41c8:10:996:21d:7dff:fec3:df70", # 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
-          "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
-        ]
-      },
-      :backup => {
-        :comment => "Backups",
-        :path => "/store/backup",
-        :read_only => false,
-        :write_only => true,
-        :list => false,
-        :uid => "osmbackup",
-        :gid => "osmbackup",
-        :transfer_logging => false,
-        :hosts_allow => [
-          "128.40.168.0/24",      # ucl external
-          "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
-        ]
+      :external => {
+        :interface => "bond0.101",
+        :role => :external,
+        :inet => {
+          :address => "184.104.226.106"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::a"
+        }
       }
     }
   }
-);
+)
 
 run_list(
-  "role[ic]",
-  "role[gateway]",
-  "role[chef-server]",
-  "role[chef-repository]",
-  "role[planet]",
-  "role[stats]",
-  "role[web-storage]",
-  "recipe[rsyncd]",
-  "recipe[openvpn]"
+  "role[equinix-dub]",
+  "role[geodns]",
+  "role[planet]"
 )