Merge branch 'CHEF-2212'

6 files changed, 19 insertions, 13 deletions

diff --git a/Rakefile b/Rakefile
index c154bf0029..631baa87cb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -157,7 +157,7 @@ def start_dev_environment(type="normal")
   sleep 2
   configure_rabbitmq(type)
   start_chef_solr(type)
-  start_chef_solr_indexer(type)
+  start_chef_expander(type)
   start_chef_server(type)
   start_chef_webui(type)
   puts "Running CouchDB at #{@couchdb_server_pid}"
diff --git a/chef/lib/chef/knife/bootstrap/centos5-gems.erb b/chef/lib/chef/knife/bootstrap/centos5-gems.erb
index 0646f613c3..4f1256c173 100644
--- a/chef/lib/chef/knife/bootstrap/centos5-gems.erb
+++ b/chef/lib/chef/knife/bootstrap/centos5-gems.erb
@@ -1,11 +1,17 @@
 bash -c '
-rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm
-rpm -Uvh http://download.elff.bravenet.com/5/i386/elff-release-5-3.noarch.rpm
+if [ ! -f /usr/bin/chef-client ]; then
+  rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm
+  rpm -Uvh http://download.elff.bravenet.com/5/i386/elff-release-5-3.noarch.rpm
 
-yum install -q -y ruby ruby-devel gcc gcc-c++ automake autoconf rubygems make
+  yum install -q -y ruby ruby-devel gcc gcc-c++ automake autoconf make
+
+  cd /tmp
+  wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
+  tar zxf rubygems-1.3.7.tgz
+  cd rubygems-1.3.7
+  ruby setup.rb --no-format-executable
+fi
 
-gem update --system
-gem update
 gem install ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
 
 mkdir -p /etc/chef
@@ -25,10 +31,10 @@ log_location     STDOUT
 chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
 validation_client_name "<%= Chef::Config[:validation_client_name] %>"
 <% if @config[:chef_node_name] == nil %>
-# Using default node name"
+# Using default node name (fqdn)
 <% else %>
 node_name "<%= @config[:chef_node_name] %>"
-<% end %> 
+<% end %>
 EOP
 ) > /etc/chef/client.rb
 
diff --git a/chef/lib/chef/knife/bootstrap/fedora13-gems.erb b/chef/lib/chef/knife/bootstrap/fedora13-gems.erb
index 301f377dd3..c0b78f6323 100644
--- a/chef/lib/chef/knife/bootstrap/fedora13-gems.erb
+++ b/chef/lib/chef/knife/bootstrap/fedora13-gems.erb
@@ -25,7 +25,7 @@ validation_client_name "<%= Chef::Config[:validation_client_name] %>"
 # Using default node name"
 <% else %>
 node_name "<%= @config[:chef_node_name] %>"
-<% end %> 
+<% end %>
 EOP
 ) > /etc/chef/client.rb
 
diff --git a/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb b/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb
index ab81c9713e..47690792b7 100644
--- a/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb
+++ b/chef/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb
@@ -1,6 +1,6 @@
 bash -c '
 if [ ! -f /usr/bin/chef-client ]; then
-  echo "chef	chef/chef_server_url	string	<%= Chef::Config[:chef_server_url] %>" | debconf-set-selections 
+  echo "chef	chef/chef_server_url	string	<%= Chef::Config[:chef_server_url] %>" | debconf-set-selections
   [ -f /etc/apt/sources.list.d/opscode.list ] || echo "deb http://apt.opscode.com lucid main" > /etc/apt/sources.list.d/opscode.list
   wget -O- http://apt.opscode.com/packages@opscode.com.gpg.key | apt-key add -
 fi
@@ -21,7 +21,7 @@ rm /tmp/validation.pem
 
 <% if @config[:chef_node_name] %>
 [ `grep -qx "node_name \"<%= @config[:chef_node_name] %>\"" /etc/chef/client.rb` ] || echo "node_name \"<%= @config[:chef_node_name] %>\"" >> /etc/chef/client.rb
-<% end -%> 
+<% end -%>
 
 (
 cat <<'EOP'
diff --git a/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb b/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
index 0b0dd1e332..31bb54d834 100644
--- a/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
+++ b/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
@@ -27,7 +27,7 @@ log_location     STDOUT
 chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
 validation_client_name "<%= Chef::Config[:validation_client_name] %>"
 <% if @config[:chef_node_name] == nil %>
-# Using default node name"
+# Using default node name (fqdn)
 <% else %>
 node_name "<%= @config[:chef_node_name] %>"
 <% end %>
diff --git a/features/support/env.rb b/features/support/env.rb
index d1a45d436d..8a2dfd1e66 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -17,7 +17,7 @@
 Thread.abort_on_exception = true
 
 require 'rubygems'
-require 'spec/expectations'
+require 'rspec/expectations'
 
 CHEF_PROJECT_ROOT = File.expand_path(File.dirname(__FILE__) + '/../../')
 KNIFE_CONFIG = CHEF_PROJECT_ROOT + '/features/data/config/knife.rb'