Run phpfpm exporter in group www-data to allow socket access

[chef.git] / roles / ironbelly.rb

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

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

   :bind => {
     :clients => "equinix-ams"
   },
   :bind => {
     :clients => "equinix-ams"
   },


@@ -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]
         }
       },


@@ -62,12 +62,12 @@ default_attributes(
     :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" } },
     :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 cisco_550x], :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",
     },
     :metrics => {
       :uplink_interface => {
         :help => "Site uplink interface name",

-        :labels => { :site => "amsterdam", :name => "te[12]/0/1" }
+        :labels => { :site => "amsterdam", :name => "ge-[01]/2/0" }

       }
     }
   },
       }
     }
   },