chef-vpc-toolkit 2.8.0 → 2.8.1

data/CHANGELOG

@@ -1,3 +1,10 @@
+* Tue Dec 8 2011 Dan Prince <dan.prince@rackspace.com> - 2.8.1
+  - Add JSON option for chef:install task to specify custom nodes.json files.
+  - Don't re-add the notification handler to the config file if it already
+    exists.
+  - Add support for cloning git:// cookbook repo URL's.
+  - Add restart check for Rabbit which sometimes fails or is slow to start.
+
 * Tue Nov 8 2011 Dan Prince <dan.prince@rackspace.com> - 2.8.0
   - Add chef_interval option to chef_installer.conf.
   - Add RESTART_ON_FAILURE and RESTART_TIMEOUT options to poll_clients task.

data/VERSION

@@ -1 +1 @@
-2.8.0
+2.8.1

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

@@ -38,6 +38,7 @@ local CHEF_NOTIFICATION_HANDLER=/var/lib/chef/handlers/netcat.rb
 sed -e "s|localhost|$SERVER_NAME|g" -i $CLIENT_CONFIG
 sed -e "s|^chef_server_url.*|chef_server_url \"http://$SERVER_NAME:4000\"|g" -i $CLIENT_CONFIG
 sed -e "s|^log_location.*|log_location \"\/var/log/chef/client.log\"|g" -i $CLIENT_CONFIG
+if ! grep "$CHEF_NOTIFICATION_HANDLER" $CLIENT_CONFIG &> /dev/null; then
 cat >> $CLIENT_CONFIG <<-EOF_CAT_CHEF_CLIENT_CONF
 # custom Chef notification handler
 require "$CHEF_NOTIFICATION_HANDLER"
@@ -45,7 +46,7 @@ netcat_handler = NetcatHandler.new
 report_handlers << netcat_handler
 exception_handlers << netcat_handler
 EOF_CAT_CHEF_CLIENT_CONF
-
+fi
 
 local CHEF_SYSCONFIG=/etc/default/chef-client
 [ -d /etc/sysconfig/ ] && CHEF_SYSCONFIG=/etc/sysconfig/chef-client
@@ -206,16 +207,30 @@ for CB_REPO in $COOKBOOK_URLS; do
 echo -n "Downloading $CB_REPO..."
 	if [ "http:" == ${CB_REPO:0:5} ] || [ "https:" == ${CB_REPO:0:6} ]; then
 		wget --no-check-certificate "$CB_REPO" -O "/tmp/cookbook-repo.tar.gz" &> /dev/null || { echo "Failed to download cookbook tarball."; return 1; }
+	elif [ "git:" == ${CB_REPO:0:4} ]; then
+		if [ -f /usr/bin/yum ]; then
+			rpm -q git &> /dev/null || yum install -y -q git
+		elif [ -f /usr/bin/dpkg ]; then
+			dpkg -L git > /dev/null 2>&1 || apt-get install -y --quiet git > /dev/null 2>&1
+		else
+			echo "Failed to install git."
+			exit 1
+		fi
+        pushd $REPOS_BASEDIR
+        git clone "$CB_REPO"
+        popd
 	else
 		download_cloud_file "$CB_REPO" "/tmp/cookbook-repo.tar.gz"
 	fi
 echo "OK"
-[ -d "$REPOS_BASEDIR" ] || mkdir -p "$REPOS_BASEDIR"
-cd $REPOS_BASEDIR
-echo -n "Extracting $CB_REPO..."
-tar xzf /tmp/cookbook-repo.tar.gz
-rm /tmp/cookbook-repo.tar.gz
-echo "OK"
+if [ -f /tmp/cookbook-repo.tar.gz ]; then
+	[ -d "$REPOS_BASEDIR" ] || mkdir -p "$REPOS_BASEDIR"
+	cd $REPOS_BASEDIR
+	echo -n "Extracting $CB_REPO..."
+	tar xzf /tmp/cookbook-repo.tar.gz
+	rm /tmp/cookbook-repo.tar.gz
+	echo "OK"
+fi
 done
 
 }
@@ -253,6 +268,14 @@ function start_chef_server {
 		/sbin/chkconfig couchdb on &> /dev/null
 		$SERVICE_BIN rabbitmq-server start </dev/null &> /dev/null
 		/sbin/chkconfig rabbitmq-server on &> /dev/null
+		sleep 3
+
+		local RABBIT_ERR_SIZE=$(stat -c%s "/var/log/rabbitmq/startup_err")
+		if (( $RABBIT_ERR_SIZE > 0 )); then
+			$SERVICE_BIN rabbitmq-server stop </dev/null &> /dev/null
+			$SERVICE_BIN rabbitmq-server start </dev/null &> /dev/null
+			sleep 3
+		fi
 
 		# Chef 0.9: chef-solr chef-solr-indexer chef-server chef-server-webui
 		# Chef 0.10: chef-solr chef-expander chef-server chef-server-webui
@@ -260,6 +283,7 @@ function start_chef_server {
             if [ -f /etc/init.d/$svc ]; then
 				$SERVICE_BIN $svc start
 				/sbin/chkconfig $svc on &> /dev/null
+				sleep 3
 			fi
 		done
 	fi

data/rake/chef_vpc_toolkit.rake

@@ -177,6 +177,11 @@ namespace :chef do
 		group=ServerGroup.fetch(:source => "cache")
 		configs["ssh_gateway_ip"]=group.vpn_gateway_ip
 
+		json_config_file=ENV['JSON']
+		if not json_config_file.nil? then
+			configs["chef_json_file"] = json_config_file
+		end
+
 		server_name=ENV['SERVER_NAME']
 		if server_name.nil? then
 			client_validation_key=ChefInstaller.install_chef_server(configs, group.os_types)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-vpc-toolkit
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 2
   - 8
-  - 0
-  version: 2.8.0
+  - 1
+  version: 2.8.1
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 -05:00
+date: 2011-12-08 00:00:00 -05:00
 default_executable: chef-vpc-toolkit
 dependencies: 
 - !ruby/object:Gem::Dependency