chef-vpc-toolkit 2.2.0 → 2.3.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+* Thu Feb 15 2011 Dan Prince <dan.prince@rackspace.com> - 2.3.0
+  - Support for setting server group VPN device (tap/tun)
+  - Fix issue where chef client would occasionally not start on Ubuntu.
+  - Use regex's instead of start_with? (support Ruby 1.8.6)
+
 * Thu Feb 6 2011 Dan Prince <dan.prince@rackspace.com> - 2.2.0
   - Support command execution with 'rake ssh'.
   - The 'chef:tail_logs' task now supports the SERVER_NAME variable.
@@ -7,7 +12,6 @@
   - Implement 'group:delete_server' task.
   - Implement 'group:list REMOTE=true' task.
   - Implement 'group:join' task.
-  - Implement 'group:join' task.
   - Update the 'chef:install' task to support the SERVER_NAME variable.
   - The 'chef:sync_repos' task is now 'chef:push_repos'.
   - Implement a 'chef:pull_repos' task.

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.3.0

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

@@ -26,6 +26,7 @@ if ! dpkg -L chef &> /dev/null; then
 
 	/etc/init.d/chef-client stop &> /dev/null
 	sleep 2
+	kill -9 $(pgrep chef-client) || true
 	rm /var/log/chef/client.log
 
 fi

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

@@ -42,7 +42,7 @@ MULTI_PART_BOUNDARY="jtZ!pZ1973um"
 
 			if ssl_key then
 				pkey_data=IO.read(ssl_key)
-				if pkey_data.start_with?("-----BEGIN RSA PRIVATE KEY-----")
+				if pkey_data =~ /^-----BEGIN RSA PRIVATE KEY-----/
 					@@http.key=OpenSSL::PKey::RSA.new(pkey_data)
 				else
 					@@http.key=OpenSSL::PKey::DSA.new(pkey_data)

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

@@ -26,6 +26,7 @@ class ServerGroup
 	attr_accessor :name
 	attr_accessor :description
 	attr_accessor :domain_name
+	attr_accessor :vpn_device
 	attr_accessor :vpn_network
 	attr_accessor :vpn_subnet
 	attr_accessor :owner_name
@@ -37,6 +38,7 @@ class ServerGroup
 		@name=options[:name]
 		@description=options[:description]
 		@domain_name=options[:domain_name]
+		@vpn_device=options[:vpn_device] or @vpn_device="tun"
 		@vpn_network=options[:vpn_network] or @vpn_network="172.19.0.0"
 		@vpn_subnet=options[:vpn_subnet] or @vpn_subnet="255.255.128.0"
 		@owner_name=options[:owner_name] or @owner_name=ENV['USER']
@@ -74,6 +76,7 @@ class ServerGroup
 			:name => json_hash["name"],
 			:description => json_hash["description"],
 			:domain_name => json_hash["domain_name"],
+			:vpn_device => json_hash["vpn_device"],
 			:vpn_network => json_hash["vpn_network"],
 			:vpn_subnet => json_hash["vpn_subnet"]
 			)
@@ -107,6 +110,7 @@ class ServerGroup
 			sg.description(@description)
 			sg.tag! "owner-name", @owner_name
 			sg.tag! "domain-name", @domain_name
+			sg.tag! "vpn-device", @vpn_device
 			sg.tag! "vpn-network", @vpn_network
 			sg.tag! "vpn-subnet", @vpn_subnet
 			sg.servers("type" => "array") do |xml_servers|
@@ -152,6 +156,7 @@ class ServerGroup
 				:id => XMLUtil.element_text(sg_xml, "id").to_i,
 				:domain_name => XMLUtil.element_text(sg_xml, "domain-name"),
 				:description => XMLUtil.element_text(sg_xml, "description"),
+				:vpn_device => XMLUtil.element_text(sg_xml, "vpn-device"),
 				:vpn_network => XMLUtil.element_text(sg_xml, "vpn-network"),
 				:vpn_subnet => XMLUtil.element_text(sg_xml, "vpn-subnet")
 			)

data/lib/chef-vpc-toolkit/vpn_network_manager.rb

@@ -167,6 +167,14 @@ module VpnNetworkManager
 						value.string("yes")
 					end
 				end
+				if group.vpn_device == "tap"
+					entrylist.entry do |entry|
+						entry.key("vpn/tap-dev")
+						entry.value do |value|
+							value.string("yes")
+						end
+					end
+				end
 				entrylist.entry do |entry|
 					entry.key("vpn/remote")
 					entry.value do |value|

data/rake/chef_vpc_toolkit.rake

@@ -341,7 +341,7 @@ task :ssh => 'group:init' do
 
 	sg=ServerGroup.fetch(:source => "cache")
 	args=ARGV[1, ARGV.length].join(" ")
-	if ARGV[1] and ARGV[1].start_with?('GROUP_ID=')
+	if ARGV[1] and ARGV[1] =~ /^GROUP_ID=/
 		args=ARGV[2, ARGV.length].join(" ")
 	end
 	exec("ssh -o \"StrictHostKeyChecking no\" root@#{sg.vpn_gateway_ip} #{args}")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-vpc-toolkit
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: false
   segments: 
   - 2
-  - 2
+  - 3
   - 0
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 -05:00
+date: 2011-02-16 00:00:00 -05:00
 default_executable: chef-vpc-toolkit
 dependencies: 
 - !ruby/object:Gem::Dependency