chef-vpc-toolkit 2.7.0 → 2.7.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Thu Oct 20 2011 Dan Prince <dan.prince@rackspace.com> - 2.7.1
+  - Support for image snapshots where chef is pre-installed.
+
 * Wed Oct 5 2011 Dan Prince <dan.prince@rackspace.com> - 2.7.0
   - Support for Fedora 15, Ubuntu 11.04, and Debian 6.0.
 

data/VERSION

@@ -1 +1 @@
-2.7.0
+2.7.1

data/lib/chef-vpc-toolkit/chef-0.9.bash

@@ -243,17 +243,21 @@ done
 
 function start_chef_server {
 
-	# Ubuntu starts the Chef server automatically
-	if [ -f /bin/rpm ]; then
-		/sbin/service couchdb start 1> /dev/null
-		/sbin/chkconfig couchdb on
-		/sbin/service rabbitmq-server start </dev/null &> /dev/null
-		/sbin/chkconfig rabbitmq-server on
+	local SERVICE_BIN="/usr/sbin/service"
+	[ -f /bin/rpm ] && SERVICE_BIN="/sbin/service"
+
+	[ -d /var/run/chef ] && chown chef:chef /var/run/chef
+
+	if [ ! -f /var/run/chef/server.main.pid ]; then 
+		$SERVICE_BIN couchdb start 1> /dev/null
+		/sbin/chkconfig couchdb on &> /dev/null
+		$SERVICE_BIN rabbitmq-server start </dev/null &> /dev/null
+		/sbin/chkconfig rabbitmq-server on &> /dev/null
 
 		for svc in chef-solr chef-solr-indexer chef-server chef-server-webui
 		do
-			/sbin/service $svc start
-			/sbin/chkconfig $svc on
+			$SERVICE_BIN $svc start
+			/sbin/chkconfig $svc on &> /dev/null
 		done
 	fi
 
@@ -261,9 +265,12 @@ function start_chef_server {
 
 function start_chef_client {
 
-	/etc/init.d/chef-client start
+    local SERVICE_BIN="/usr/sbin/service"
+    [ -f /bin/rpm ] && SERVICE_BIN="/sbin/service"
+
+	$SERVICE_BIN chef-client start
     if [ -f /sbin/chkconfig ]; then
-		chkconfig chef-client on
+		chkconfig chef-client on &> /dev/null
 	fi
 
 }

data/lib/chef-vpc-toolkit/chef_bootstrap/unknown.bash

@@ -0,0 +1,4 @@
+#for unknown images we require that Chef is preinstalled
+function install_chef {
+  return 0
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-vpc-toolkit
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 2
   - 7
-  - 0
-  version: 2.7.0
+  - 1
+  version: 2.7.1
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 -04:00
+date: 2011-10-21 00:00:00 -04:00
 default_executable: chef-vpc-toolkit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,7 +83,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - .rvmrc
 - CHANGELOG
 - COPYING
@@ -122,6 +121,7 @@ files:
 - lib/chef-vpc-toolkit/chef_bootstrap/rhel.bash
 - lib/chef-vpc-toolkit/chef_bootstrap/ubuntu-opscode.bash
 - lib/chef-vpc-toolkit/chef_bootstrap/ubuntu.bash
+- lib/chef-vpc-toolkit/chef_bootstrap/unknown.bash
 - lib/chef-vpc-toolkit/chef_installer.rb
 - lib/chef-vpc-toolkit/cloud-servers-vpc/client.rb
 - lib/chef-vpc-toolkit/cloud-servers-vpc/connection.rb
@@ -150,8 +150,8 @@ homepage: http://github.com/rackspace/chef-vpc-toolkit
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -179,11 +179,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rake tasks to automate and configure server groups in the cloud with Chef.
-test_files: 
-- test/client_test.rb
-- test/ssh_util_test.rb
-- test/server_group_test.rb
-- test/test_helper.rb
-- test/util_test.rb
-- test/server_test.rb
-- test/vpn_network_manager_test.rb
+test_files: []
+

data/.gitignore

@@ -1,9 +0,0 @@
-tmp
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg