Turn the nginx access log off properly

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 988d636eb7fd9c6f68f99d1fed04286300499870..1694191e1f5b469306e93ce63dcaa641d1c1edfd 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -5,6 +5,10 @@ default_attributes(
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },
+  :dhcpd => {
+    :first_address => "10.0.63.1",
+    :last_address => "10.0.63.254"
+  },
   :elasticsearch => {
     :cluster => {
       :routing => {
@@ -22,29 +26,44 @@ default_attributes(
       :data => "/store/elasticsearch"
     }
   },
+  :munin => {
+    :graphs => {
+      :apcpdu_ams => {
+        :title => "Current for Amsterdam",
+        :vlabel => "Amps",
+        :category => "Ups",
+        :values => {
+          :load => {
+            :sum => ["apcpdu_pdu1.load", "apcpdu_pdu2.load"],
+            :label => "Load"
+          }
+        }
+      }
+    }
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
         :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "10.0.48.2",
+        :address => "10.0.48.10",
         :bond => {
           :slaves => %w[eth0 eth1]
         }
       },
       :external_ipv4 => {
-        :interface => "bond0.3",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "130.117.76.2"
+        :address => "130.117.76.10"
       },
-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1002"
-      # }
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:A"
+      }
     }
   },
   :openvpn => {
@@ -121,7 +140,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ic]",
+  "role[equinix]",
   "role[gateway]",
   "role[web-storage]",
   "role[supybot]",
@@ -131,6 +150,7 @@ run_list(
   # "role[planetdump]",
   "role[logstash]",
   "recipe[rsyncd]",
+  "recipe[dhcpd]",
   "recipe[openvpn]",
   "recipe[tilelog]"
 )