Serve private git repositories with git-http-backend

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 959f9f74ac6ca70f42d209fac166a33ed4b0098d..8b90bbb446eea553e94708a2ba7dd6f72aa1cebc 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -2,6 +2,32 @@ name "ironbelly"
 description "Master role applied to ironbelly"
 
 default_attributes(
+  :apt => {
+    :sources => ["ubuntugis-unstable"]
+  },
+  :elasticsearch => {
+    :cluster => {
+      :routing => {
+        :allocation => {
+          :disk => {
+            :watermark => {
+              :low => "95%",
+              :high => "98%"
+            }
+          }
+        }
+      }
+    },
+    :path => {
+      :data => "/store/elasticsearch"
+    }
+  },
+  :git => {
+    :allowed_nodes => "fqdn:*",
+    :user => "chefrepo",
+    :group => "chefrepo",
+    :backup => "chef-git"
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
@@ -33,9 +59,27 @@ default_attributes(
         :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 => {
@@ -47,9 +91,9 @@ default_attributes(
         :uid => "tomh",
         :gid => "tomh",
         :transfer_logging => false,
-        :hosts_allow => [ 
-          "89.16.179.150",                       # shenron
-          "2001:41c8:10:996:21d:7dff:fec3:df70", # shenron
+        :hosts_allow => [
+          "212.110.172.32",                      # shenron
+          "2001:41c9:1:400::32",                 # shenron
           "212.159.112.221"                      # grant
         ]
       },
@@ -63,27 +107,34 @@ default_attributes(
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [
-          "128.40.168.0/24",      # ucl external
+          "193.60.236.0/24",      # ucl external
           "146.179.159.160/27",   # ic internal
           "193.63.75.96/27",      # ic external
           "2001:630:12:500::/64", # ic 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"
       }
     }
   }
-);
+)
 
 run_list(
   "role[ic]",
   "role[gateway]",
-  "role[chef-server]",
-  "role[chef-repository]",
   "role[web-storage]",
   "role[supybot]",
   "role[backup]",
   "role[stats]",
+  "role[planet]",
+  "role[planetdump]",
+  "role[logstash]",
+  "role[letsencrypt]",
   "recipe[rsyncd]",
-  "recipe[openvpn]"
+  "recipe[openvpn]",
+  "recipe[tilelog]"
 )