Merge remote-tracking branch 'github/pull/76'

[chef.git] / roles / foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index fa96196f597d27b1879465ab01c45265f3cbc9ce..4926edeb2e59fbdd990c471fc92f9f5a6613ba30 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -10,6 +10,14 @@ default_attributes(
   :apt => {
     :sources => ["passenger"]
   },
+  :elasticsearch => {
+    :cluster => {
+      :name => "foundation"
+    },
+    :script => {
+      :disable_dynamic => false
+    }
+  },
   :memcached => {
     :memory_limit => 400,
     :chunk_growth_factor => 1.05,
@@ -19,6 +27,8 @@ default_attributes(
 
 run_list(
   "role[crm]",
+  "role[elasticsearch]",
   "recipe[foundation::wiki]",
-  "recipe[foundation::board]"
+  "recipe[foundation::board]",
+  "recipe[foundation::dwg]"
 )