Update elasticsearch to 2.x on ridley

[chef.git] / roles / foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index cc80f3dfe9b2d0d339c40378dae8792d7c9153d8..22f8dc3eb0f52ee170fc21cf9254b6a0168bdb7e 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -8,7 +8,16 @@ default_attributes(
     :keepalive => false
   },
   :apt => {
-    :sources => [ "brightbox", "aw-drupal" ]
+    :sources => ["passenger", "brightbox-ruby-ng"]
+  },
+  :elasticsearch => {
+    :version => "2.x",
+    :cluster => {
+      :name => "foundation"
+    },
+    :script => {
+      :disable_dynamic => false
+    }
   },
   :memcached => {
     :memory_limit => 400,
@@ -18,6 +27,10 @@ default_attributes(
 )
 
 run_list(
-  "recipe[mediawiki]",
-  "recipe[civicrm]"
+  "role[crm]",
+  "role[elasticsearch]",
+  "recipe[foundation::wiki]",
+  "recipe[foundation::board]",
+  "recipe[foundation::dwg]",
+  "recipe[foundation::owg]"
 )