chef-vpc-toolkit 2.5.2 → 2.6.0

data/CHANGELOG

@@ -1,3 +1,11 @@
+* Thu Jun 21 2011 Dan Prince <dan.prince@rackspace.com> - 2.6.0
+  - Update to support images that have Chef preinstalled.
+  - Skip missing nodes when trying to install Chef.
+  - Added vpn_connection_type option w/ support for using command line
+    openvpn or network_manager.
+  - Add support for 'udp' VPN protocol. Default protocol is 'tcp'.
+    UDP support requires Cloud Servers VPC 2.2.0 or greater.
+
 * 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.

data/README.rdoc

@@ -22,13 +22,15 @@ The Chef VPC Toolkit is a set of Rake tasks that provide a framework to help aut
 
 == Installation
 
-Requires Ruby and Rubygems. The app was developed with Ruby 1.8.7.
+Requires Ruby and Rubygems. The app was developed with Ruby 1.8.7 and 1.9.2.
 
-The following gems are required:
+The following gems are required when developing/building the toolkit gem:
 
 	rake
 	builder (2.1.2)
 	json (> 1.4.3)
+	uuidtools
+	jeweler
 
 To install the gem:
 

data/VERSION

@@ -1 +1 @@
-2.5.2
+2.6.0

data/config/server_group.json

@@ -2,6 +2,7 @@
 	"name": "test",
 	"domain_name": "vpc",
 	"description": "test description",
+    "vpn_device": "tun",
 	"servers": {
 		"login": {
 			"image_id": "69",

data/contrib/etc/chef_vpc_toolkit.conf

@@ -8,7 +8,13 @@ cloud_servers_vpc_password:
 # The text editor to use for Chef knife commands. Used when a new server group
 # is created. Default: vim
 # knife_editor: vim
-#
+
 # VPN client name. The name given to this machine when connecting to a
 # server group as a VPN client.
 # vpn_client_name: local
+
+# VPN connection type:
+#  -'openvpn' use command line openvpn to join the VPN
+#  -'network_manager' use Network Manager (Fedora 14 and Ubuntu 10.10 only)
+#
+vpn_connection_type: openvpn

data/lib/chef-vpc-toolkit.rb

@@ -3,6 +3,8 @@ require 'chef-vpc-toolkit/chef_installer'
 require 'chef-vpc-toolkit/ssh_util'
 require 'chef-vpc-toolkit/version'
 require 'chef-vpc-toolkit/xml_util'
+require 'chef-vpc-toolkit/vpn_connection'
+require 'chef-vpc-toolkit/vpn_openvpn'
 require 'chef-vpc-toolkit/vpn_network_manager'
 require 'chef-vpc-toolkit/cloud-servers-vpc/connection'
 require 'chef-vpc-toolkit/cloud-servers-vpc/client'
@@ -10,3 +12,19 @@ require 'chef-vpc-toolkit/cloud-servers-vpc/server'
 require 'chef-vpc-toolkit/cloud-servers-vpc/server_group'
 require 'chef-vpc-toolkit/cloud-servers-vpc/ssh_public_key'
 require 'chef-vpc-toolkit/cloud-servers-vpc/vpn_network_interface'
+
+module ChefVPCToolkit
+
+	# Loads the appropriate VPN connection type based on
+	# the configuration variable 'vpn_connection_type'.
+	#
+	def self.get_vpn_connection(group, client = nil)
+		configs = Util.load_configs
+		if "#{configs['vpn_connection_type']}" == "network_manager"
+			VpnNetworkManager.new(group, client)
+		else
+			VpnOpenVpn.new(group, client)
+		end
+	end
+
+end

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

@@ -29,6 +29,16 @@ def self.get_cookbook_repos(options)
 	end
 end
 
+def self.install_chef_script(install_type="CLIENT", os_type="")
+	return "" if os_type.nil? or os_type.empty?
+
+	return %{
+	#{IO.read(File.dirname(__FILE__) + "/chef_bootstrap/#{os_type}.bash")}
+	install_chef "#{install_type}"
+	}
+
+end
+
 # validate the chef.json config file by parsing it
 def self.validate_json(options)
 
@@ -91,9 +101,8 @@ data=%x{
 ssh -o "StrictHostKeyChecking no" root@#{options['ssh_gateway_ip']} bash <<-"EOF_GATEWAY"
 ssh #{options['chef_server_name']} bash <<-"EOF_BASH"
 #{IO.read(File.dirname(__FILE__) + "/cloud_files.bash")}
-#{IO.read(File.dirname(__FILE__) + "/chef_bootstrap/#{os_type}.bash")}
+#{install_chef_script('SERVER', os_type)}
 #{IO.read(CHEF_INSTALL_FUNCTIONS)}
-install_chef "SERVER"
 
 mkdir -p /root/cookbook-repos
 
@@ -155,11 +164,14 @@ def self.install_chef_client(options, client_name, client_validation_key, os_typ
 
 	data=%x{
 	ssh -o "StrictHostKeyChecking no" root@#{options['ssh_gateway_ip']} bash <<-"EOF_GATEWAY"
+	if ! grep -c "#{client_name}" /etc/hosts &> /dev/null; then
+		echo "Client '#{client_name}' doesn't exist."
+		exit 0
+	fi
 	ssh #{client_name} bash <<-"EOF_BASH"
 	#{IO.read(File.dirname(__FILE__) + "/cloud_files.bash")}
-	#{IO.read(File.dirname(__FILE__) + "/chef_bootstrap/#{os_type}.bash")}
 	#{IO.read(CHEF_INSTALL_FUNCTIONS)}
-	install_chef "CLIENT"
+	#{install_chef_script('CLIENT', os_type)}
 	configure_chef_client '#{options['chef_server_name']}' '#{client_validation_key}'
 	start_chef_client
 	EOF_BASH

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

@@ -27,6 +27,7 @@ class ServerGroup
 	attr_accessor :description
 	attr_accessor :domain_name
 	attr_accessor :vpn_device
+	attr_accessor :vpn_proto
 	attr_accessor :vpn_network
 	attr_accessor :vpn_subnet
 	attr_accessor :owner_name
@@ -39,6 +40,7 @@ class ServerGroup
 		@description=options[:description]
 		@domain_name=options[:domain_name]
 		@vpn_device=options[:vpn_device] or @vpn_device="tun"
+		@vpn_proto=options[:vpn_proto] or @vpn_proto="tcp"
 		@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']
@@ -86,6 +88,7 @@ class ServerGroup
 			:description => json_hash["description"],
 			:domain_name => json_hash["domain_name"],
 			:vpn_device => json_hash["vpn_device"],
+			:vpn_proto => json_hash["vpn_proto"],
 			:vpn_network => json_hash["vpn_network"],
 			:vpn_subnet => json_hash["vpn_subnet"]
 			)
@@ -119,7 +122,8 @@ 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-device", @vpn_device if @vpn_device != "tun"
+			sg.tag! "vpn-proto", @vpn_proto if @vpn_proto != "tcp"
 			sg.tag! "vpn-network", @vpn_network
 			sg.tag! "vpn-subnet", @vpn_subnet
 			sg.servers("type" => "array") do |xml_servers|
@@ -181,6 +185,7 @@ class ServerGroup
 				: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_proto => XMLUtil.element_text(sg_xml, "vpn-proto"),
 				:vpn_network => XMLUtil.element_text(sg_xml, "vpn-network"),
 				:vpn_subnet => XMLUtil.element_text(sg_xml, "vpn-subnet")
 			)

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

@@ -32,7 +32,7 @@ module Util
 			raise_if_nil_or_empty(configs, "cloud_servers_vpc_password")
 			@@configs=configs
 		else
-			raise "Failed to load cloud toolkit config file. Please configure /etc/chef_vpc_toolkit.conf or create a .chef_vpc_toolkit.conf config file in your HOME directory."
+			raise "Failed to load chef VPC toolkit config file. Please configure /etc/chef_vpc_toolkit.conf or create a .chef_vpc_toolkit.conf config file in your HOME directory."
 		end
 
 		@@configs

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

@@ -0,0 +1,43 @@
+
+module ChefVPCToolkit
+class VpnConnection
+
+       	CERT_DIR=File.join(ENV['HOME'], '.pki', 'openvpn')
+
+		def initialize(group, client = nil)
+			@group = group
+			@client = client
+		end
+
+		def create_certs
+			@ca_cert=get_cfile('ca.crt')
+			@client_cert=get_cfile('client.crt')
+			@client_key=get_cfile('client.key')
+
+			vpn_interface = @client.vpn_network_interfaces[0]
+
+			FileUtils.mkdir_p(get_cfile)
+			File::chmod(0700, File.join(ENV['HOME'], '.pki'))
+			File::chmod(0700, CERT_DIR)
+
+			File.open(@ca_cert, 'w') { |f| f.write(vpn_interface.ca_cert) }
+			File.open(@client_cert, 'w') { |f| f.write(vpn_interface.client_cert) }
+			File.open(@client_key, 'w') do |f|
+				f.write(vpn_interface.client_key)
+				f.chmod(0600)
+			end
+        end
+
+		def delete_certs
+			FileUtils.rm_rf(get_cfile)
+		end
+
+		def get_cfile(file = nil)
+			if file
+				File.join(CERT_DIR, @group.id.to_s, file)
+			else
+				File.join(CERT_DIR, @group.id.to_s)
+			end
+		end
+end
+end

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

@@ -9,32 +9,36 @@ require 'tempfile'
 
 module ChefVPCToolkit
 
-module VpnNetworkManager
+class VpnNetworkManager < VpnConnection
 
-	CERT_DIR=File.join(ENV['HOME'], '.pki', 'openvpn')
+	def initialize(group, client = nil)
+		super(group, client)
+	end
 
-	def self.configure_gconf(group, client)
+	def connect
+		create_certs
+		configure_gconf
+		puts %x{#{sudo_display} nmcli con up id "VPC Group: #{@group.id}"}
+	end
 
-		ca_cert=File.join(CERT_DIR, group.id.to_s, 'ca.crt')
-		client_cert=File.join(CERT_DIR, group.id.to_s, 'client.crt')
-		client_key=File.join(CERT_DIR, group.id.to_s, 'client.key')
+	def disconnect
+		puts %x{#{sudo_display} nmcli con down id "VPC Group: #{@group.id}"}
+	end
 
-		vpn_interface=client.vpn_network_interfaces[0]
+	def connected?
+		return system("#{sudo_display} nmcli con status | grep -c 'VPC Group: #{@group.id}' &> /dev/null")
+	end
 
-		FileUtils.mkdir_p(File.join(CERT_DIR, group.id.to_s))
-		File::chmod(0700, File.join(ENV['HOME'], '.pki'))
-		File::chmod(0700, CERT_DIR)
+	def clean
+		unset_gconf_config
+		delete_certs
+	end
 
-		File.open(ca_cert, 'w') { |f| f.write(vpn_interface.ca_cert) }
-		File.open(client_cert, 'w') { |f| f.write(vpn_interface.client_cert) }
-		File.open(client_key, 'w') do |f|
-			f.write(vpn_interface.client_key)
-			f.chmod(0600)
-		end
+	def configure_gconf
 
 		xml = Builder::XmlMarkup.new
 		xml.gconfentryfile do |file|
-			file.entrylist({ "base" => "/system/networking/connections/vpc_#{group.id}"}) do |entrylist|
+			file.entrylist({ "base" => "/system/networking/connections/vpc_#{@group.id}"}) do |entrylist|
 
 				entrylist.entry do |entry|
 					entry.key("connection/autoconnect")
@@ -45,7 +49,7 @@ module VpnNetworkManager
 				entrylist.entry do |entry|
 					entry.key("connection/id")
 					entry.value do |value|
-						value.string("VPC Group: #{group.id}")
+						value.string("VPC Group: #{@group.id}")
 					end
 				end
 				entrylist.entry do |entry|
@@ -83,7 +87,7 @@ module VpnNetworkManager
 					entry.key("ipv4/dns")
 					entry.value do |value|
 						value.list("type" => "int") do |list|
-							ip=IPAddr.new(group.vpn_network.chomp("0")+"1")
+							ip=IPAddr.new(@group.vpn_network.chomp("0")+"1")
 							list.value do |lv|
 								lv.int(ip_to_integer(ip.to_s))
 							end
@@ -95,7 +99,7 @@ module VpnNetworkManager
 					entry.value do |value|
 						value.list("type" => "string") do |list|
 							list.value do |lv|
-								lv.string(group.domain_name)
+								lv.string(@group.domain_name)
 							end
 						end
 					end
@@ -134,13 +138,13 @@ module VpnNetworkManager
 				entrylist.entry do |entry|
 					entry.key("vpn/ca")
 					entry.value do |value|
-						value.string(ca_cert)
+						value.string(@ca_cert)
 					end
 				end
 				entrylist.entry do |entry|
 					entry.key("vpn/cert")
 					entry.value do |value|
-						value.string(client_cert)
+						value.string(@client_cert)
 					end
 				end
 				entrylist.entry do |entry|
@@ -158,16 +162,25 @@ module VpnNetworkManager
 				entrylist.entry do |entry|
 					entry.key("vpn/key")
 					entry.value do |value|
-						value.string(client_key)
+						value.string(@client_key)
 					end
 				end
-				entrylist.entry do |entry|
-					entry.key("vpn/proto-tcp")
-					entry.value do |value|
-						value.string("yes")
+				if @group.vpn_proto == "tcp"
+					entrylist.entry do |entry|
+						entry.key("vpn/proto-tcp")
+						entry.value do |value|
+							value.string("yes")
+						end
+					end
+				else
+					entrylist.entry do |entry|
+						entry.key("vpn/proto-udp")
+						entry.value do |value|
+							value.string("yes")
+						end
 					end
 				end
-				if group.vpn_device == "tap"
+				if @group.vpn_device == "tap"
 					entrylist.entry do |entry|
 						entry.key("vpn/tap-dev")
 						entry.value do |value|
@@ -178,7 +191,7 @@ module VpnNetworkManager
 				entrylist.entry do |entry|
 					entry.key("vpn/remote")
 					entry.value do |value|
-						value.string(group.vpn_gateway_ip)
+						value.string(@group.vpn_gateway_ip)
 					end
 				end
 				entrylist.entry do |entry|
@@ -201,39 +214,22 @@ module VpnNetworkManager
 
 	end
 
-	def self.unset_gconf_config(server_group_id)
-		puts %x{gconftool-2 --recursive-unset /system/networking/connections/vpc_#{server_group_id}}
+	def unset_gconf_config
+		puts %x{gconftool-2 --recursive-unset /system/networking/connections/vpc_#{@group.id}}
 	end
 
-	def self.delete_certs(server_group_id)
-		FileUtils.rm_rf(File.join(CERT_DIR, server_group_id.to_s))
-	end
-
-	def self.connect(server_group_id)
-		puts %x{#{sudo_display} nmcli con up id "VPC Group: #{server_group_id}"}
-	end
-
-	def self.disconnect(server_group_id)
-		puts %x{#{sudo_display} nmcli con down id "VPC Group: #{server_group_id}"}
-	end
-
-	def self.connected?(server_group_id)
-		return system("#{sudo_display} nmcli con status | grep -c 'VPC Group: #{server_group_id}' &> /dev/null")
-	end
-
-	def self.ip_to_integer(ip_string)
+	def ip_to_integer(ip_string)
 		return 0 if ip_string.nil?
 		ip_arr=ip_string.split(".").collect{ |s| s.to_i }
 		return ip_arr[0] + ip_arr[1]*2**8 + ip_arr[2]*2**16 + ip_arr[3]*2**24
 	end
 
-	def self.sudo_display
+	def sudo_display
 		if ENV['DISPLAY'].nil? or ENV['DISPLAY'] != ":0.0" then
 			"sudo"
 		else
 			""
 		end
 	end
-
 end
 end

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

@@ -0,0 +1,111 @@
+
+module ChefVPCToolkit
+class VpnOpenVpn < VpnConnection
+
+	def initialize(group, client = nil)
+		super(group, client)
+	end
+
+	def connect
+		create_certs
+
+		@up_script=get_cfile('up.bash')
+		File.open(@up_script, 'w') do |f|
+				f << <<EOF_UP
+#!/bin/bash
+
+# setup routes
+/sbin/route add #{@group.vpn_network.chomp("0")+"1"} dev \$dev
+/sbin/route add -net #{@group.vpn_network} netmask 255.255.128.0 gw #{@group.vpn_network.chomp("0")+"1"}
+
+mv /etc/resolv.conf /etc/resolv.conf.bak
+egrep ^search /etc/resolv.conf.bak | sed -e 's/search /search #{@group.domain_name} /' > /etc/resolv.conf
+echo 'nameserver #{@group.vpn_network.chomp("0")+"1"}' >> /etc/resolv.conf
+grep ^nameserver /etc/resolv.conf.bak >> /etc/resolv.conf
+EOF_UP
+			f.chmod(0700)
+		end
+		@down_script=get_cfile('down.bash')
+		File.open(@down_script, 'w') do |f|
+				f << <<EOF_DOWN
+#!/bin/bash
+mv /etc/resolv.conf.bak /etc/resolv.conf
+EOF_DOWN
+			f.chmod(0700)
+		end
+
+		@config_file=get_cfile('config')
+		File.open(@config_file, 'w') do |f|
+			f << <<EOF_CONFIG
+client
+dev #{@group.vpn_device}
+proto #{@group.vpn_proto}
+
+#Change my.publicdomain.com to your public domain or IP address
+remote #{@group.vpn_gateway_ip} 1194
+
+resolv-retry infinite
+nobind
+persist-key
+persist-tun
+
+script-security 2
+
+ca #{@ca_cert}
+cert #{@client_cert}
+key #{@client_key}
+
+ns-cert-type server
+
+route-nopull
+
+comp-lzo
+
+verb 3
+up #{@up_script}
+down #{@down_script}
+EOF_CONFIG
+			f.chmod(0600)
+		end
+
+		disconnect if File.exist?(get_cfile('openvpn.pid'))
+		out=%x{sudo openvpn --config #{@config_file} --writepid #{get_cfile('openvpn.pid')} --daemon}
+		retval=$?
+		if retval.success? then
+			poll_vpn_interface
+			puts "OK."
+		else
+			raise "Failed to create VPN connection: #{out}"
+		end
+	end
+
+	def disconnect
+		raise "Not running? No pid file found!" unless File.exist?(get_cfile('openvpn.pid'))
+		pid = File.read(get_cfile('openvpn.pid')).chomp
+		system("sudo kill -TERM #{pid}")
+		File.delete(get_cfile('openvpn.pid'))
+	end
+
+	def connected?
+		system("/sbin/route -n | grep #{@group.vpn_network.chomp("0")+"1"} &> /dev/null")
+	end
+
+	def clean
+		delete_certs
+	end
+
+	private
+	def poll_vpn_interface
+		interface_name=@group.vpn_device+"0"
+		1.upto(30) do |i|
+			break if system("ifconfig #{interface_name} &> /dev/null")
+			if i == 30 then
+				disconnect
+				raise "Failed to connect to VPN."
+			end
+			sleep 0.5
+		end
+	end
+
+end
+end

data/rake/chef_vpc_toolkit.rake

@@ -183,7 +183,6 @@ namespace :chef do
 			ChefInstaller.create_databags(configs)
 			ChefInstaller.install_chef_clients(configs, client_validation_key, group.os_types)
 		else
-			raise "Server with name '#{server_name}' does not exist." if group.server(server_name).nil?
 			client_validation_key=ChefInstaller.client_validation_key(configs)
 			ChefInstaller.install_chef_client(configs, server_name, client_validation_key, group.os_types[server_name])
 		end
@@ -298,8 +297,8 @@ namespace :vpn do
 			Rake::Task['vpn:poll_client'].invoke
 		end
 		client=Client.fetch(:id => group.id, :source => "cache")
-		ChefVPCToolkit::VpnNetworkManager.configure_gconf(group, client)
-		ChefVPCToolkit::VpnNetworkManager.connect(group.id)
+                vpn = ChefVPCToolkit::get_vpn_connection(group, client)
+                vpn.connect
 
 	end
 
@@ -307,7 +306,8 @@ namespace :vpn do
 	task :disconnect do
 
 		group=ServerGroup.fetch(:source => "cache")
-		ChefVPCToolkit::VpnNetworkManager.disconnect(group.id)
+                vpn = ChefVPCToolkit::get_vpn_connection(group)
+                vpn.disconnect
 
 		vpn_server_ip=group.vpn_network.chomp("0")+"1"
 		SshUtil.remove_known_hosts_ip(vpn_server_ip)
@@ -315,12 +315,12 @@ namespace :vpn do
 
 	end
 
-	desc "Delete VPN config information."
+	#desc "Delete VPN config information."
 	task :delete do
 
 		group=ServerGroup.fetch(:source => "cache")
-		ChefVPCToolkit::VpnNetworkManager.unset_gconf_config(group.id)
-		ChefVPCToolkit::VpnNetworkManager.delete_certs(group.id)
+                vpn = ChefVPCToolkit::get_vpn_connection(group)
+                vpn.clean
 
 		vpn_server_ip=group.vpn_network.chomp("0")+"1"
 		SshUtil.remove_known_hosts_ip(vpn_server_ip)
@@ -333,7 +333,7 @@ namespace :vpn do
 
 	end
 
-	desc "Create a new VPN client."
+	#desc "Create a new VPN client."
 	task :create_client do
 
 		group=ServerGroup.fetch(:source => "cache")
@@ -348,7 +348,7 @@ namespace :vpn do
 		
 	end
 
-	desc "Poll until a client is online"
+	#desc "Poll until a client is online"
 	task :poll_client do
 
 		group=ServerGroup.fetch(:source => "cache")
@@ -415,7 +415,8 @@ task :rdesktop => 'group:init' do
     pass=sg.server(server_name).admin_password
 
     if use_public_ip.nil? then
-		if ChefVPCToolkit::VpnNetworkManager.connected?(sg.id)
+            vpn = ChefVPCToolkit::get_vpn_connection(sg)
+            if vpn.connected?
             # on the VPN we connect directly to the windows machine
             local_ip=%x{ssh -o \"StrictHostKeyChecking no\" root@#{sg.vpn_gateway_ip} grep #{server_name}.#{sg.domain_name} /etc/hosts | cut -f 1}.chomp
             exec("rdesktop #{local_ip} -u Administrator -p #{pass}")

data/test/vpn_network_manager_test.rb

@@ -10,27 +10,27 @@ class VpnNetworkManagerTest < Test::Unit::TestCase
   include ChefVPCToolkit::CloudServersVPC
 
   def setup
+    @group=ServerGroup.from_xml(SERVER_GROUP_XML)
+    @client=Client.from_xml(CLIENT_XML)
     tmpdir=TmpDir.new_tmp_dir
     File.open(File.join(tmpdir, "gconftool-2"), 'w') do |f|
       f.write("#!/bin/bash\nexit 0")
       f.chmod(0755)
     end
     ENV['PATH']=tmpdir+":"+ENV['PATH']
+	@vpn_net_man = VpnNetworkManager.new(@group, @client)
   end
 
   def teardown
-    group=ServerGroup.from_xml(SERVER_GROUP_XML)
-    VpnNetworkManager.delete_certs(group.id)
+    @vpn_net_man.delete_certs
   end
 
   def test_configure_gconf
-    group=ServerGroup.from_xml(SERVER_GROUP_XML)
-    client=Client.from_xml(CLIENT_XML)
-    assert VpnNetworkManager.configure_gconf(group, client)
+    assert @vpn_net_man.configure_gconf
   end
 
   def test_ip_to_integer
-    assert_equal 16782252, VpnNetworkManager.ip_to_integer("172.19.0.1")
+    assert_equal 16782252, @vpn_net_man.ip_to_integer("172.19.0.1")
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-vpc-toolkit
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: false
   segments: 
   - 2
-  - 5
-  - 2
-  version: 2.5.2
+  - 6
+  - 0
+  version: 2.6.0
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 -07:00
+date: 2011-06-21 00:00:00 -04:00
 default_executable: chef-vpc-toolkit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -132,7 +132,9 @@ files:
 - lib/chef-vpc-toolkit/ssh_util.rb
 - lib/chef-vpc-toolkit/util.rb
 - lib/chef-vpc-toolkit/version.rb
+- lib/chef-vpc-toolkit/vpn_connection.rb
 - lib/chef-vpc-toolkit/vpn_network_manager.rb
+- lib/chef-vpc-toolkit/vpn_openvpn.rb
 - lib/chef-vpc-toolkit/xml_util.rb
 - rake/chef_vpc_toolkit.rake
 - test/client_test.rb
@@ -177,10 +179,10 @@ signing_key:
 specification_version: 3
 summary: Rake tasks to automate and configure server groups in the cloud with Chef.
 test_files: 
-- test/server_group_test.rb
-- test/util_test.rb
+- test/client_test.rb
 - test/ssh_util_test.rb
+- test/server_group_test.rb
 - test/test_helper.rb
-- test/vpn_network_manager_test.rb
+- test/util_test.rb
 - test/server_test.rb
-- test/client_test.rb
+- test/vpn_network_manager_test.rb