Fix bind client role for Amsterdam

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index e3c8ef2c049869593fb66253816bed17d18428f9..362ac19a3db023f5fc616c607841e026be90a2a8 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -5,6 +5,13 @@ default_attributes(
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },

+  :bind => {
+    :clients => "equinix-ams"
+  },
+  :dhcpd => {
+    :first_address => "10.0.63.1",
+    :last_address => "10.0.63.254"
+  },

   :elasticsearch => {
     :cluster => {
       :routing => {
   :elasticsearch => {
     :cluster => {
       :routing => {


@@ -12,7 +19,8 @@ default_attributes(
           :disk => {
             :watermark => {
               :low => "95%",
           :disk => {
             :watermark => {
               :low => "95%",

-              :high => "98%"
+              :high => "98%",
+              :flood_stage => "99%"

             }
           }
         }
             }
           }
         }


@@ -47,35 +55,15 @@ 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 => {
   :planet => {

-    :replication => "disabled"
+    :replication => "enabled"
+  },
+  :prometheus => {
+    :snmp => {
+      "pdu1" => { :address => "10.0.48.100", :module => "apcups", :labels => { "site" => "amsterdam" } },
+      "pdu2" => { :address => "10.0.48.101", :module => "apcups", :labels => { "site" => "amsterdam" } },
+      "switch1" => { :address => "130.117.76.2", :module => "if_mib", :labels => { "site" => "amsterdam" } }
+    }

   },
   :rsyncd => {
     :modules => {
   },
   :rsyncd => {
     :modules => {


@@ -121,16 +109,14 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

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

   "role[gateway]",
   "role[web-storage]",
   "role[supybot]",
   "role[backup]",
   "role[gateway]",
   "role[web-storage]",
   "role[supybot]",
   "role[backup]",

-  "role[stats]",

   "role[planet]",
   "role[planet]",

-  # "role[planetdump]",
-  "role[logstash]",
+  "role[planetdump]",

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

-  "recipe[openvpn]",
+  "recipe[dhcpd]",

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