Revert "Update board wiki to 1.39"

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 2f05572fb1009330586ea4db84ffbe34f1ef5494..e6b27496cb09b6de8fdbc219733e833371955acd 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -2,11 +2,8 @@ name "ironbelly"
 description "Master role applied to ironbelly"
 
 default_attributes(
 description "Master role applied to ironbelly"
 
 default_attributes(

-  :apt => {
-    :sources => ["ubuntugis-unstable"]
-  },

   :bind => {
   :bind => {

-    :clients => "equinix"
+    :clients => "equinix-ams"

   },
   :dhcpd => {
     :first_address => "10.0.63.1",
   },
   :dhcpd => {
     :first_address => "10.0.63.1",


@@ -38,6 +35,9 @@ default_attributes(
         :family => :inet,
         :address => "10.0.48.10",
         :bond => {
         :family => :inet,
         :address => "10.0.48.10",
         :bond => {

+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",

           :slaves => %w[eth0 eth1]
         }
       },
           :slaves => %w[eth0 eth1]
         }
       },


@@ -55,53 +55,24 @@ default_attributes(
       }
     }
   },
       }
     }
   },

-  :openvpn => {
-    :address => "10.0.16.2",
-    :tunnels => {
-      :ic2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
-      },
-      :aws2ic => {
-        :port => "1195",
-        :mode => "server",
-        :peer => {
-          :host => "fafnir.openstreetmap.org"
-        }
-      },
-      :ic2bm => {
-        :port => "1196",
-        :mode => "client",
-        :peer => {
-          :host => "grisu.openstreetmap.org",
-          :port => "1194"
-        }
-      }
-    }
-  },

   :planet => {
     :replication => "enabled"
   },
   :planet => {
     :replication => "enabled"
   },

+  :prometheus => {
+    :snmp => {
+      "pdu1" => { :address => "10.0.48.100", :modules => %w[apcups], :labels => { "site" => "amsterdam" } },
+      "pdu2" => { :address => "10.0.48.101", :modules => %w[apcups], :labels => { "site" => "amsterdam" } },
+      "switch1" => { :address => "130.117.76.2", :modules => %w[if_mib juniper_ex4300], :labels => { "site" => "amsterdam" } }
+    },
+    :metrics => {
+      :uplink_interface => {
+        :help => "Site uplink interface name",
+        :labels => { :site => "amsterdam", :name => "ge-[01]/2/0" }
+      }
+    }
+  },

   :rsyncd => {
     :modules => {
   :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",
       :logs => {
         :comment => "Log files",
         :path => "/store/logs",


@@ -113,32 +84,31 @@ default_attributes(
         :transfer_logging => false,
         :hosts_allow => [
           "193.60.236.0/24",          # ucl external
         :transfer_logging => false,
         :hosts_allow => [
           "193.60.236.0/24",          # ucl external

-          "10.0.48.0/20",             # equinix internal
-          "130.117.76.0/27",          # equinix external
-          "2001:978:2:2C::172:0/112", # equinix external
+          "10.0.48.0/20",             # amsterdam internal
+          "130.117.76.0/27",          # amsterdam external
+          "2001:978:2:2C::172:0/112", # amsterdam external
+          "10.0.64.0/20",             # dublin internal
+          "184.104.226.96/27",        # dublin external
+          "2001:470:1:b3b::/64",      # dublin external

           "10.0.32.0/20",             # bytemark internal
           "89.16.162.16/28",          # bytemark external
           "2001:41c9:2:d6::/64",      # bytemark external
           "127.0.0.0/8",              # localhost
           "::1"                       # localhost
           "10.0.32.0/20",             # bytemark internal
           "89.16.162.16/28",          # bytemark external
           "2001:41c9:2:d6::/64",      # bytemark external
           "127.0.0.0/8",              # localhost
           "::1"                       # localhost

-        ],
-        :nodes_allow => "roles:tilecache"
+        ]

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "role[equinix]",
+  "role[equinix-ams]",

   "role[gateway]",
   "role[gateway]",

-  "role[web-storage]",

   "role[supybot]",
   "role[backup]",
   "role[planet]",
   "role[planetdump]",
   "role[supybot]",
   "role[backup]",
   "role[planet]",
   "role[planetdump]",

-  "role[logstash]",

   "recipe[rsyncd]",
   "recipe[dhcpd]",
   "recipe[rsyncd]",
   "recipe[dhcpd]",

-  "recipe[openvpn]",

   "recipe[tilelog]"
 )
   "recipe[tilelog]"
 )