replace chef/nanite with bunny driver

1 files changed, 10 insertions, 13 deletions

diff --git a/Rakefile b/Rakefile
index fcfa40b221..fc9e664537 100644
--- a/Rakefile
+++ b/Rakefile
@@ -57,23 +57,17 @@ def configure_rabbitmq(type="normal")
   # hack. wait for rabbit to come up.
   sleep 2
   
-  puts `rabbitmqctl add_vhost /nanite`
+  puts `rabbitmqctl add_vhost /chef`
 
-  # create 'mapper' and 'nanite' users, give them each the password 'testing'
-  %w[mapper nanite].each do |agent|
-    puts `rabbitmqctl add_user #{agent} testing`
-  end
-
-  # grant the mapper user the ability to do anything with the /nanite vhost
-  # the three regex's map to config, write, read permissions respectively
-  puts `rabbitmqctl set_permissions -p /nanite mapper ".*" ".*" ".*"`
+  # create 'chef' user, give it the password 'testing'
+  puts `rabbitmqctl add_user chef testing`
 
-  # grant the nanite user more limited permissions on the /nanite vhost
-  puts `rabbitmqctl set_permissions -p /nanite nanite ".*" ".*" ".*"`
+  # the three regexes map to config, write, read permissions respectively
+  puts `rabbitmqctl set_permissions -p /chef chef ".*" ".*" ".*"`
 
   puts `rabbitmqctl list_users`
   puts `rabbitmqctl list_vhosts`
-  puts `rabbitmqctl list_permissions -p /nanite`
+  puts `rabbitmqctl list_permissions -p /chef`
   
 end
 
@@ -108,6 +102,7 @@ def start_chef_solr_indexer(type="normal")
 end
 
 def start_chef_server(type="normal")
+  puts "Staring #{type} chef development server"
   @chef_server_pid     = nil
   mcid = fork
   if mcid # parent
@@ -115,8 +110,10 @@ def start_chef_server(type="normal")
   else # child
     case type
     when "normal"
+      puts "Starting chef server for development with './chef-server/bin/chef-server -a thin -l debug -N'"
       exec("./chef-server/bin/chef-server -a thin -l debug -N")
     when "features"
+      puts "Starting chef server for features with #{["./chef-server/bin/chef-server -a thin -C #{File.join(File.dirname(__FILE__), "features", "data", "config", "server.rb")} -l debug -N"].join(' ')}"
       exec("./chef-server/bin/chef-server -a thin -C #{File.join(File.dirname(__FILE__), "features", "data", "config", "server.rb")} -l debug -N")
     end
   end
@@ -184,7 +181,7 @@ namespace :dev do
     start_dev_environment("features")
     wait_for_ctrlc
   end
-
+  
   namespace :features do
     
     namespace :start do