fix features start for new solr hotness

2 files changed, 7 insertions, 4 deletions

diff --git a/Rakefile b/Rakefile
index 720783f92b..4a46610f7f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -97,6 +97,8 @@ def start_chef_solr(type="normal")
     when "normal"
       exec("./chef-solr/bin/chef-solr -l debug")
     when "features"
+      p = fork { exec("./chef-solr/bin/chef-solr-installer -p /tmp/chef_solr_for_features --force") }
+      Process.wait(p)
       exec("./chef-solr/bin/chef-solr -c #{File.join(File.dirname(__FILE__), "features", "data", "config", "server.rb")} -l debug")
     end
   end
diff --git a/features/data/config/server.rb b/features/data/config/server.rb
index 8ba01ae2ab..295db68c0f 100644
--- a/features/data/config/server.rb
+++ b/features/data/config/server.rb
@@ -2,6 +2,7 @@ require 'tmpdir'
 
 supportdir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 tmpdir = File.expand_path(File.join(File.dirname(__FILE__), "..", "tmp"))
+solr_tmp_dir = '/tmp/chef_solr_for_features'
 
 log_level              :debug
 log_location           STDOUT
@@ -34,13 +35,13 @@ client_key       File.join(systmpdir, "client.pem")
 web_ui_client_name "chef-webui"
 web_ui_key File.join(systmpdir, "webui.pem")
 
-solr_jetty_path File.join(supportdir, "solr", "jetty")
-solr_data_path File.join(supportdir, "solr", "data")
-solr_home_path File.join(supportdir, "solr", "home")
+solr_jetty_path File.join(solr_tmp_dir, "solr-jetty")
+solr_data_path File.join(solr_tmp_dir, "solr", "data")
+solr_home_path File.join(solr_tmp_dir, "solr")
 solr_heap_size "250M"
 
 amqp_host '0.0.0.0'
-amqp_port '5672'
+amqp_port 5672
 amqp_user 'chef'
 amqp_pass 'testing'
 amqp_vhost '/chef'