chef-vpc-toolkit 2.4.0 → 2.5.0

data/CHANGELOG

@@ -1,3 +1,10 @@
+* Thu Apr 14 2011 Dan Prince <dan.prince@rackspace.com> - 2.5.0
+  - Make /root/cookbook-repos on the Chef server if it doesn't exist.
+  - Add cache_file option to the VPC Client class.
+  - Implement 'rdesktop' task for Windows servers.
+  - Implement 'group:vpn_gateway_ip' task.
+  - Store client information in the server group cache.
+
 * Thu Mar 27 2011 Dan Prince <dan.prince@rackspace.com> - 2.4.0
   - Implement 'chef:poll_clients' task.
 

data/README.rdoc

@@ -73,6 +73,11 @@ Example commands:
 
 		$ rake vpn:disconnect
 
+	- Connect to a Windows machine using rdesktop.
+
+		$ rake rdesktop SERVER_NAME=win1
+
+
 == Bash Automation Script
 The following is an example bash script to spin up a group and run commands via SSH. Useful for CI automation in Hudson, etc.
 
@@ -81,10 +86,15 @@ The following is an example bash script to spin up a group and run commands via
 	chef-vpc-toolkit -v
 	trap "rake group:delete" INT TERM EXIT # cleanup the group on exit
 
+	# create a server group and Chef (includes Chef Server, cookbooks, clients)
 	rake create
-	VPN_GW=$(rake group:show | grep "VPN gateway IP" | sed -e "s|VPN gateway IP: ||")
-	ssh root@$VPN_GW bash <<-EOF_BASH
-		# do stuff here
+
+	# wait for Chef clients to finish running
+	rake chef:poll_clients
+
+	# Run some scripts on the login server
+	rake ssh bash <<-EOF_BASH
+		echo 'It works!'
 	EOF_BASH
 
 == Author
@@ -94,4 +104,4 @@ Dan Prince <dan.prince@rackspace.com>
 == License
 
 See COPYING for license information.
-Copyright (c) 2010, Rackspace US, Inc.
+Copyright (c) 2010-2011, Rackspace US, Inc.

data/VERSION

@@ -1 +1 @@
-2.4.0
+2.5.0

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

@@ -207,6 +207,7 @@ echo -n "Downloading $CB_REPO..."
 		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

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

@@ -19,6 +19,7 @@ class Client
 	attr_accessor :description
 	attr_accessor :status
 	attr_accessor :server_group_id
+	attr_accessor :cache_file
 
 	def initialize(options={})
 		@id=options[:id].to_i
@@ -26,6 +27,7 @@ class Client
 		@description=options[:description]
 		@status=options[:status] or @status = "Pending"
 		@server_group_id=options[:server_group_id]
+		@cache_file=options[:cache_file] or options[:server_group_id]
 
 		@vpn_network_interfaces=[]
 	end
@@ -36,14 +38,14 @@ class Client
 
     def cache_to_disk
         FileUtils.mkdir_p(@@data_dir)
-        File.open(File.join(@@data_dir, "#{@server_group_id}.xml"), 'w') do |f|
+        File.open(File.join(@@data_dir, "#{@cache_file}.xml"), 'w') do |f|
             f.chmod(0600)
             f.write(self.to_xml)
         end
     end
 
 	def delete
-		client_xml_file=File.join(@@data_dir, "#{@server_group_id}.xml")
+		client_xml_file=File.join(@@data_dir, "#{@cache_file}.xml")
         if File.exists?(client_xml_file) then
             File.delete(client_xml_file)
         end
@@ -139,7 +141,7 @@ class Client
 
 	end
 
-	def self.create(server_group, client_name)
+	def self.create(server_group, client_name, cache_to_disk=true)
 
 		xml = Builder::XmlMarkup.new
 		xml.client do |client|
@@ -150,14 +152,14 @@ class Client
 
 		xml=Connection.post("/clients.xml", xml.target!)
 		client=Client.from_xml(xml)
-		client.cache_to_disk
+		client.cache_to_disk if cache_to_disk
 		client
 
 	end
 
-    # Fetch a server group. The following options are available:
+    # Fetch a client. The following options are available:
     #
-    # :id - The ID of the group containing the client to fetch.
+    # :id - The ID of the client to fetch.
     # :source - valid options are 'remote' and 'cache'
     #
 	def self.fetch(options = {})

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

@@ -17,6 +17,7 @@ class Server
 	attr_accessor :retry_count
 	attr_accessor :error_message
 	attr_accessor :status
+	attr_accessor :admin_password
 
 	def initialize(options={})
 		@id=options[:id].to_i
@@ -27,6 +28,7 @@ class Server
 		@cloud_server_id_number=options[:cloud_server_id_number].to_i
 		@flavor_id=options[:flavor_id].to_i
 		@image_id=options[:image_id].to_i
+		@admin_password=options[:admin_password]
 		@server_group_id=options[:server_group_id].to_i
 		@openvpn_server = [true, "true"].include?(options[:openvpn_server])
 		@retry_count=options[:retry_count].to_i or 0
@@ -51,6 +53,7 @@ class Server
 			server.tag! "cloud-server-id-number", @cloud_server_id_number if @cloud_server_id_number
 			server.tag! "flavor-id", @flavor_id
 			server.tag! "image-id", @image_id
+			server.tag! "admin-password", @admin_password
 			server.tag! "server-group-id", @server_group_id
 			server.tag! "openvpn-server", "true" if openvpn_server?
 			server.tag! "error-message", @error_message if @error_message
@@ -70,6 +73,7 @@ class Server
 				:name => XMLUtil.element_text(sg_xml, "name"),
 				:flavor_id => XMLUtil.element_text(sg_xml, "flavor-id"),
 				:image_id => XMLUtil.element_text(sg_xml, "image-id"),
+				:admin_password => XMLUtil.element_text(sg_xml, "admin-password"),
 				:description => XMLUtil.element_text(sg_xml, "description"),
 				:cloud_server_id_number => XMLUtil.element_text(sg_xml, "cloud-server-id-number"),
 				:description => XMLUtil.element_text(sg_xml, "description"),

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

@@ -44,6 +44,7 @@ class ServerGroup
 		@owner_name=options[:owner_name] or @owner_name=ENV['USER']
 
 		@servers=[]
+		@clients=[]
 		@ssh_public_keys=[]
     end
 
@@ -55,6 +56,14 @@ class ServerGroup
 		@servers
 	end
 
+	def client(name)
+		@clients.select {|s| s.name == name}[0] if @clients.size > 0
+	end
+
+    def clients
+        @clients
+    end
+
 	def vpn_gateway_name
 		@servers.select {|s| s.openvpn_server? }[0].name if @servers.size > 0
 	end
@@ -121,6 +130,9 @@ class ServerGroup
 						xml_server.description(server.description)
 						xml_server.tag! "flavor-id", server.flavor_id
 						xml_server.tag! "image-id", server.image_id
+                        if server.admin_password then
+						    xml_server.tag! "admin-password", server.admin_password
+                        end
 						xml_server.tag! "cloud-server-id-number", server.cloud_server_id_number if server.cloud_server_id_number
 						xml_server.tag! "status", server.status if server.status
 						xml_server.tag! "external-ip-addr", server.external_ip_addr if server.external_ip_addr
@@ -141,6 +153,17 @@ class ServerGroup
 					end
 				end
 			end
+			sg.tag! "clients", { "type" => "array"} do |xml_clients|
+				self.clients.each do |client|
+					xml_clients.tag! "client" do |xml_client|
+						xml_client.id client.id
+						xml_client.name client.name
+						xml_client.description client.description
+						xml_client.status client.status
+					end
+				end
+			end
+
 		end
 		xml.target!
 
@@ -172,12 +195,24 @@ class ServerGroup
 					:internal_ip_addr => XMLUtil.element_text(server_xml, "internal-ip-addr"),
 					:error_message => XMLUtil.element_text(server_xml, "error-message"),
 					:image_id => XMLUtil.element_text(server_xml, "image-id"),
+					:admin_password => XMLUtil.element_text(server_xml, "admin-password"),
 					:flavor_id => XMLUtil.element_text(server_xml, "flavor-id"),
 					:retry_count => XMLUtil.element_text(server_xml, "retry-count"),
 					:openvpn_server => XMLUtil.element_text(server_xml, "openvpn-server")
 				)
 				sg.servers << server
 			end
+			REXML::XPath.each(dom, "//client") do |client_xml|
+
+				client=Client.new(
+					:id => XMLUtil.element_text(client_xml, "id").to_i,
+					:name => XMLUtil.element_text(client_xml, "name"),
+					:description => XMLUtil.element_text(client_xml, "description"),
+					:status => XMLUtil.element_text(client_xml, "status")
+				)
+				sg.clients << client
+			end
+
 		end
 
 		sg

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

@@ -217,6 +217,10 @@ module VpnNetworkManager
 		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)
 		return 0 if ip_string.nil?
 		ip_arr=ip_string.split(".").collect{ |s| s.to_i }

data/rake/chef_vpc_toolkit.rake

@@ -137,6 +137,12 @@ namespace :group do
 		puts "Server '#{server_name}' deleted."
 	end
 
+	desc "Print the VPN gateway IP address"
+	task :vpn_gateway_ip do
+		group=ServerGroup.fetch(:source => "cache")
+		puts group.vpn_gateway_ip
+	end
+
 end
 
 namespace :server do
@@ -393,6 +399,40 @@ task :rechef => [ "server:rebuild", "group:poll" ] do
 
 end
 
+desc "Use rdesktop to connect to Windows servers."
+task :rdesktop => 'group:init' do
+
+    server_name=ENV['SERVER_NAME']
+    raise "Please specify a SERVER_NAME." if server_name.nil?
+
+    # VPC machines have their public IPs disabled
+    # This option is useful for debugging failed VPN connections
+    use_public_ip=ENV['PUBLIC_IP']
+
+    sg=ServerGroup.fetch(:source => "cache")
+    pass=sg.server(server_name).admin_password
+
+    if use_public_ip.nil? then
+		if ChefVPCToolkit::VpnNetworkManager.connected?(sg.id)
+            # 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}")
+        else
+            # when not on the VPN create an SSH tunnel for rdesktop traffic
+            local_ip=%x{ssh -o \"StrictHostKeyChecking no\" root@#{sg.vpn_gateway_ip} grep #{server_name}.#{sg.domain_name} /etc/hosts | cut -f 1}.chomp
+            %x{
+            ssh root@#{sg.vpn_gateway_ip} -L 1234:#{local_ip}:3389 'sleep 3 & exit' &
+            sleep 1
+            rdesktop localhost:1234 -u Administrator -p #{pass}
+            }
+        end
+    else
+        public_ip=sg.server(server_name).external_ip_addr
+        exec("rdesktop #{public_ip} -u Administrator -p #{pass}")
+    end
+
+end
+
 desc "Alias to the vpn:connect task."
 task :vpn => "vpn:connect"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-vpc-toolkit
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 2
-  - 4
+  - 5
   - 0
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -04:00
+date: 2011-04-14 00:00:00 -04:00
 default_executable: chef-vpc-toolkit
 dependencies: 
 - !ruby/object:Gem::Dependency