chef-vpc-toolkit 2.5.1 → 2.5.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Thu Apr 24 2011 Dan Prince <dan.prince@rackspace.com> - 2.5.2
+  - Raise an error in the chef:poll_clients task if a timeout occurs.
+  - Use CDN to install Chef for Ubuntu.
+
 * Thu Apr 16 2011 Dan Prince <dan.prince@rackspace.com> - 2.5.1
   - Updates to support Ruby 1.9.2.
 

data/VERSION

@@ -1 +1 @@
-2.5.1
+2.5.2

data/lib/chef-vpc-toolkit/chef_bootstrap/ubuntu-opscode.bash

@@ -0,0 +1,34 @@
+function install_chef {
+
+CODENAME=$(cat /etc/*release | grep CODENAME | sed -e "s|^.*=\([^$]*\)$|\1|")
+[[ "$CODENAME" == "maverick" ]] && CODENAME="lucid"
+local INSTALL_TYPE=${1:-"CLIENT"} # CLIENT/SERVER
+
+[ -f /etc/apt/sources.list.d/opscode.list ] || echo "deb http://apt.opscode.com $CODENAME main" > /etc/apt/sources.list.d/opscode.list
+wget -q -O- http://apt.opscode.com/packages@opscode.com.gpg.key | apt-key add - &> /dev/null || { echo "Failed to configure Apt repo."; exit 1; }
+
+dpkg -L rsync &> /dev/null || apt-get install -y rsync &> /dev/null
+
+if ! dpkg -L chef &> /dev/null; then
+
+	if [[ "$INSTALL_TYPE" == "SERVER" ]]; then
+
+		[[ "$CODENAME" == "lucid" ]] || { echo "Ubuntu 10.0.4 lucid is required for Chef server installations."; exit 1; }
+		apt-get update &> /dev/null || { echo "Failed to apt-get update."; exit 1; }
+		echo "chef-solr    chef-solr/amqp_password    password  YA1B2C301234Z" | debconf-set-selections &> /dev/null || { echo "Failed to set debconf selections for chef-solr."; exit 1; }
+		echo "chef    chef/chef_server_url    string  http://localhost:4000" | debconf-set-selections &> /dev/null || { echo "Failed to set debconf selections for chef."; exit 1; }
+		DEBIAN_FRONTEND=noninteractive apt-get install -y chef-server chef &> /dev/null || { echo "Failed to install the Chef Server via apt-get on $HOSTNAME."; exit 1; }
+	else
+		apt-get update &> /dev/null || { echo "Failed to apt-get update."; exit 1; }
+		echo "chef    chef/chef_server_url    string  http://localhost:4000" | debconf-set-selections &> /dev/null || { echo "Failed to set debconf selections for chef."; exit 1; }
+		DEBIAN_FRONTEND=noninteractive apt-get install -y chef &> /dev/null || { echo "Failed to install Chef via apt-get on $HOSTNAME."; exit 1; }
+	fi
+
+	/etc/init.d/chef-client stop &> /dev/null
+	sleep 2
+	kill -9 $(pgrep chef-client) &> /dev/null || true
+	rm /var/log/chef/client.log
+
+fi
+
+}

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

@@ -1,28 +1,46 @@
 function install_chef {
 
 CODENAME=$(cat /etc/*release | grep CODENAME | sed -e "s|^.*=\([^$]*\)$|\1|")
-[[ "$CODENAME" == "maverick" ]] && CODENAME="lucid"
 local INSTALL_TYPE=${1:-"CLIENT"} # CLIENT/SERVER
 
-[ -f /etc/apt/sources.list.d/opscode.list ] || echo "deb http://apt.opscode.com $CODENAME main" > /etc/apt/sources.list.d/opscode.list
-wget -q -O- http://apt.opscode.com/packages@opscode.com.gpg.key | apt-key add - &> /dev/null || { echo "Failed to configure Apt repo."; exit 1; }
+local CDN_BASE="http://c2521002.cdn.cloudfiles.rackspacecloud.com"
+local TARBALL="chef-client-0.9.16-ubuntu.10.10-x86_64.tar.gz"
 
+if [[ "$CODENAME" == "lucid" ]]; then
+	if [[ "$INSTALL_TYPE" == "SERVER" ]]; then
+		TARBALL="chef-server-0.9.16-ubuntu.10.04-x86_64.tar.gz"
+	else
+		TARBALL="chef-client-0.9.16-ubuntu.10.04-x86_64.tar.gz"
+	fi
+elif [[ "$CODENAME" == "maverick" ]]; then
+	if [[ "$INSTALL_TYPE" == "SERVER" ]]; then
+		TARBALL="chef-server-0.9.16-ubuntu.10.10-x86_64.tar.gz"
+	else
+		TARBALL="chef-client-0.9.16-ubuntu.10.10-x86_64.tar.gz"
+	fi
+else
+	echo "Only Ubuntu 10.04 and 10.10 are supported Chef clients."; exit 1;
+fi
+
+apt-get update &> /dev/null || { echo "Failed to apt-get update."; exit 1; }
 dpkg -L rsync &> /dev/null || apt-get install -y rsync &> /dev/null
 
 if ! dpkg -L chef &> /dev/null; then
 
-	if [[ "$INSTALL_TYPE" == "SERVER" ]]; then
+    local CHEF_PACKAGES_DIR=$(mktemp -d)
 
-		[[ "$CODENAME" == "lucid" ]] || { echo "Ubuntu 10.0.4 lucid is required for Chef server installations."; exit 1; }
-		apt-get update &> /dev/null || { echo "Failed to apt-get update."; exit 1; }
-		echo "chef-solr    chef-solr/amqp_password    password  YA1B2C301234Z" | debconf-set-selections &> /dev/null || { echo "Failed to set debconf selections for chef-solr."; exit 1; }
-		echo "chef    chef/chef_server_url    string  http://localhost:4000" | debconf-set-selections &> /dev/null || { echo "Failed to set debconf selections for chef."; exit 1; }
-		DEBIAN_FRONTEND=noninteractive apt-get install -y chef-server chef &> /dev/null || { echo "Failed to install the Chef Server via apt-get on $HOSTNAME."; exit 1; }
-	else
-		apt-get update &> /dev/null || { echo "Failed to apt-get update."; exit 1; }
-		echo "chef    chef/chef_server_url    string  http://localhost:4000" | debconf-set-selections &> /dev/null || { echo "Failed to set debconf selections for chef."; exit 1; }
-		DEBIAN_FRONTEND=noninteractive apt-get install -y chef &> /dev/null || { echo "Failed to install Chef via apt-get on $HOSTNAME."; exit 1; }
-	fi
+    wget "$CDN_BASE/$TARBALL" -O "$CHEF_PACKAGES_DIR/chef.tar.gz" &> /dev/null \
+        || { echo "Failed to download Chef RPM tarball."; exit 1; }
+	cd $CHEF_PACKAGES_DIR
+	tar xzf chef.tar.gz || { echo "Failed to extract Chef tarball."; exit 1; }
+	rm chef.tar.gz
+
+	echo "chef-solr    chef-solr/amqp_password    password  YA1B2C301234Z" | debconf-set-selections &> /dev/null || { echo "Failed to set debconf selections for chef-solr."; exit 1; }
+	echo "chef    chef/chef_server_url    string  http://localhost:4000" | debconf-set-selections &> /dev/null || { echo "Failed to set debconf selections for chef."; exit 1; }
+	DEBIAN_FRONTEND=noninteractive dpkg -i -R chef* &> /dev/null || { echo "Failed to install the Chef Server via apt-get on $HOSTNAME."; exit 1; }
+
+	cd /tmp
+	rm -Rf $CHEF_PACKAGES_DIR
 
 	/etc/init.d/chef-client stop &> /dev/null
 	sleep 2

data/rake/chef_vpc_toolkit.rake

@@ -230,7 +230,9 @@ namespace :chef do
 		configs=ChefInstaller.load_configs
 		configs["ssh_gateway_ip"]=group.vpn_gateway_ip
         puts "Polling for Chef clients to finish running..."
-        ChefInstaller.poll_clients(configs, server_list, timeout)
+        if not ChefInstaller.poll_clients(configs, server_list, timeout) then
+			raise "Chef client timeout."
+		end
 
 	end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-vpc-toolkit
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 2
   - 5
-  - 1
-  version: 2.5.1
+  - 2
+  version: 2.5.2
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 -04:00
+date: 2011-04-27 00:00:00 -07:00
 default_executable: chef-vpc-toolkit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,6 +119,7 @@ files:
 - lib/chef-vpc-toolkit/chef_bootstrap/centos.bash
 - lib/chef-vpc-toolkit/chef_bootstrap/fedora.bash
 - 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_installer.rb
 - lib/chef-vpc-toolkit/cloud-servers-vpc/client.rb