chef-vpc-toolkit 2.6.1 → 2.7.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Wed Oct 5 2011 Dan Prince <dan.prince@rackspace.com> - 2.7.0
+  - Support for Fedora 15, Ubuntu 11.04, and Debian 6.0.
+
 * Thu Jun 23 2011 Dan Prince <dan.prince@rackspace.com> - 2.6.1
   - Use /sbin/ifconfig instead of ifconfig when testing for tap/tun.
 

data/README.rdoc

@@ -12,7 +12,7 @@ The Chef VPC Toolkit is a set of Rake tasks that provide a framework to help aut
 
 -Uses Cloud Servers VPC to create secure groups of servers in the public cloud.
 
--Supports Centos, Fedora, RHEL, and Ubuntu.
+-Supports Debian, Ubuntu, Fedora, RHEL, and Centos.
 
 -Creates a local Chef Server within the server group.
 

data/VERSION

@@ -1 +1 @@
-2.6.1
+2.7.0

data/config/server_group.json

@@ -5,12 +5,12 @@
     "vpn_device": "tun",
 	"servers": {
 		"login": {
-			"image_id": "69",
+			"image_id": "75",
 			"flavor_id": "2",
 			"openvpn_server": "true"
 		},
 		"client1": {
-			"image_id": "69",
+			"image_id": "75",
 			"flavor_id": "2"
 		}
 	}

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

@@ -0,0 +1,48 @@
+function install_chef {
+
+apt-get install -y lsb-release &> /dev/null || { echo "Failed to install lsb-release"; exit 1; }
+CODENAME=$(/usr/bin/lsb_release -cs)
+local INSTALL_TYPE=${1:-"CLIENT"} # CLIENT/SERVER
+
+local CDN_BASE="http://c2521002.cdn.cloudfiles.rackspacecloud.com"
+local TARBALL="chef-client-0.9.16-debian.6.0-x86_64.tar.gz"
+
+if [[ "$CODENAME" == "squeeze" ]]; then
+	if [[ "$INSTALL_TYPE" == "SERVER" ]]; then
+		TARBALL="chef-server-0.9.16-debian.6.0-x86_64.tar.gz"
+	else
+        TARBALL="chef-client-0.9.16-debian.6.0-x86_64.tar.gz"
+	fi
+else
+	echo "Only Debian 6.0 (Squeeze) is supported at this time."; 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
+
+    local CHEF_PACKAGES_DIR=$(mktemp -d)
+
+    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; }
+	apt-get install -y ucf &> /dev/null || { echo "Failed to install ucf pkg"; 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
+	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,6 +1,7 @@
 function install_chef {
 
-CODENAME=$(cat /etc/*release | grep CODENAME | sed -e "s|^.*=\([^$]*\)$|\1|")
+apt-get install -y lsb-release &> /dev/null || { echo "Failed to install lsb-release"; exit 1; }
+CODENAME=$(/usr/bin/lsb_release -cs)
 local INSTALL_TYPE=${1:-"CLIENT"} # CLIENT/SERVER
 
 local CDN_BASE="http://c2521002.cdn.cloudfiles.rackspacecloud.com"
@@ -18,8 +19,14 @@ elif [[ "$CODENAME" == "maverick" ]]; then
 	else
 		TARBALL="chef-client-0.9.16-ubuntu.10.10-x86_64.tar.gz"
 	fi
+elif [[ "$CODENAME" == "natty" ]]; then
+	if [[ "$INSTALL_TYPE" == "SERVER" ]]; then
+		TARBALL="chef-server-0.9.18-ubuntu.11.04-x86_64.tar.gz"
+	else
+		TARBALL="chef-client-0.9.18-ubuntu.11.04-x86_64.tar.gz"
+	fi
 else
-	echo "Only Ubuntu 10.04 and 10.10 are supported Chef clients."; exit 1;
+	echo "Only Ubuntu 10.04, 10.10, and 11.04 are supported."; exit 1;
 fi
 
 apt-get update &> /dev/null || { echo "Failed to apt-get update."; exit 1; }
@@ -37,6 +44,7 @@ if ! dpkg -L chef &> /dev/null; then
 
 	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; }
+	apt-get install -y ucf &> /dev/null || { echo "Failed to install ucf pkg"; 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

data/lib/chef-vpc-toolkit/cloud-servers-vpc/server_group.rb

@@ -395,6 +395,8 @@ class ServerGroup
 					"centos"
 				when 187811 # Centos 5.4
 					"centos"
+				when 78 # Fedora 15
+					"fedora"
 				when 71 # Fedora 14
 					"fedora"
 				when 53 # Fedora 13
@@ -405,6 +407,10 @@ class ServerGroup
 					"rhel"
 				when 62 # RHEL 5.5
 					"rhel"
+				when 75 # Debian 6.0
+					"debian"
+				when 76 # Ubuntu 11.04
+					"ubuntu"
 				when 69 # Ubuntu 10.10
 					"ubuntu"
 				when 49 # Ubuntu 10.04

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-vpc-toolkit
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 2
-  - 6
-  - 1
-  version: 2.6.1
+  - 7
+  - 0
+  version: 2.7.0
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -04:00
+date: 2011-10-05 00:00:00 -04:00
 default_executable: chef-vpc-toolkit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,6 +117,7 @@ files:
 - lib/chef-vpc-toolkit.rb
 - lib/chef-vpc-toolkit/chef-0.9.bash
 - lib/chef-vpc-toolkit/chef_bootstrap/centos.bash
+- lib/chef-vpc-toolkit/chef_bootstrap/debian.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