Merge pull request #236 from Tigerfell/master

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 9a8188449b797a30fd9d403d44a145618606b07b..8bc758e762fa42769919200490bf3b6f8ff7d288 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -3,33 +3,52 @@ description "Master role applied to ironbelly"
 
 default_attributes(
   :apt => {
 
 default_attributes(
   :apt => {

-    :sources => [ "ubuntugis-unstable" ]
+    :sources => ["ubuntugis-unstable"]

   },
   },

-  :git => {
-    :allowed_nodes => "*:*",
-    :user => "chefrepo",
-    :group => "chefrepo",
-    :backup => "chef-git"
+  :dhcpd => {
+    :first_address => "10.0.63.1",
+    :last_address => "10.0.63.254"
+  },
+  :elasticsearch => {
+    :cluster => {
+      :routing => {
+        :allocation => {
+          :disk => {
+            :watermark => {
+              :low => "95%",
+              :high => "98%",
+              :flood_stage => "99%"
+            }
+          }
+        }
+      }
+    },
+    :path => {
+      :data => "/store/elasticsearch"
+    }

   },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "eth0",
+        :interface => "bond0",

         :role => :internal,
         :family => :inet,
         :role => :internal,
         :family => :inet,

-        :address => "146.179.159.177"
+        :address => "10.0.48.10",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }

       },
       :external_ipv4 => {
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "193.63.75.107"
+        :address => "130.117.76.10"

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

-        :interface => "eth1",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet6,
         :role => :external,
         :family => :inet6,

-        :address => "2001:630:12:500:225:90ff:fec4:f6ef"
+        :address => "2001:978:2:2C::172:A"

       }
     }
   },
       }
     }
   },


@@ -42,9 +61,27 @@ default_attributes(
         :peer => {
           :host => "ridley.openstreetmap.org"
         }
         :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"
+  },

   :rsyncd => {
     :modules => {
       :hosts => {
   :rsyncd => {
     :modules => {
       :hosts => {


@@ -56,7 +93,7 @@ default_attributes(
         :uid => "tomh",
         :gid => "tomh",
         :transfer_logging => false,
         :uid => "tomh",
         :gid => "tomh",
         :transfer_logging => false,

-        :hosts_allow => [ 
+        :hosts_allow => [

           "212.110.172.32",                      # shenron
           "2001:41c9:1:400::32",                 # shenron
           "212.159.112.221"                      # grant
           "212.110.172.32",                      # shenron
           "2001:41c9:1:400::32",                 # shenron
           "212.159.112.221"                      # grant


@@ -72,33 +109,33 @@ default_attributes(
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [

-          "128.40.168.0/24",      # ucl external (wates)
-          "128.40.45.192/27",     # ucl external (wolfson)
-          "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
+          "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.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"
       }
     }
   }
         ],
         :nodes_allow => "roles:tilecache"
       }
     }
   }

-);
+)

 
 run_list(
 
 run_list(

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

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

-  "role[chef-server]",
-  "role[chef-repository]",

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

-  "role[stats]",

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

+  "role[logstash]",

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

+  "recipe[dhcpd]",

   "recipe[openvpn]",
   "recipe[openvpn]",

-  "recipe[git::server]",

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