knife-vsphere 0.8.1 → 0.9.0

data/lib/chef/knife/BaseVsphereCommand.rb

@@ -267,6 +267,15 @@ class Chef
 				exit 1
 			end
 
+			def tcp_test_port_vm(vm,port)
+			  ip = vm.guest.ipAddress
+			  if ip.nil?
+			    sleep 2
+			    return false
+			  end
+			  tcp_test_port(ip, port)
+			end
+
 			def tcp_test_port(hostname,port)
 			  tcp_socket = TCPSocket.new(hostname, port)
 			  readable = IO.select([tcp_socket], nil, nil, 5)

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -155,17 +155,21 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 		:short => "-d DISTRO",
 		:long => "--distro DISTRO",
 		:description => "Bootstrap a distro using a template"
-	$default[:distro] = "ubuntu10.04-gems"
 
 	option :template_file,
 		:long => "--template-file TEMPLATE",
 		:description => "Full path to location of template to use"
 
-	option :run_list,
-		:short => "-r RUN_LIST",
-		:long => "--run-list RUN_LIST",
-		:description => "Comma separated list of roles/recipes to apply"
-	$default[:run_list] = ''
+  option :run_list,
+    :short => "-r RUN_LIST",
+    :long => "--run-list RUN_LIST",
+    :description => "Comma separated list of roles/recipes to apply"
+  $default[:run_list] = ''
+
+  option :secret_file,
+    :long => "--secret-file SECRET_FILE",
+    :description => "A file containing the secret key to use to encrypt data bag item values"
+  $default[:secret_file] = ''
 
 	option :no_host_key_verify,
 		:long => "--no-host-key-verify",
@@ -190,7 +194,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     :long =>  "--log_level",
     :description => "Set the log level (debug, info, warn, error, fatal) for chef-client",
     :proc => lambda { |l| l.to_sym }
-    
+
 	def run
 		$stdout.sync = true
 
@@ -438,7 +442,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 		bootstrap = Chef::Knife::Bootstrap.new
 		bootstrap.name_args = [config[:fqdn]]
 		bootstrap.config[:run_list] = get_config(:run_list).split(/[\s,]+/)
-		bootstrap.config[:ssh_user] = get_config(:ssh_user)
+    bootstrap.config[:secret_file] = get_config(:secret_file)
+    bootstrap.config[:ssh_user] = get_config(:ssh_user)
 		bootstrap.config[:ssh_password] = get_config(:ssh_password)
 		bootstrap.config[:ssh_port] = get_config(:ssh_port)
 		bootstrap.config[:identity_file] = get_config(:identity_file)

data/lib/chef/knife/vsphere_vm_delete.rb

@@ -1,66 +1,66 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# License:: Apache License, Version 2.0
-#
-
-require 'chef/knife'
-require 'chef/knife/BaseVsphereCommand'
-require 'rbvmomi'
-
-# These two are needed for the '--purge' deletion case
-require 'chef/node'
-require 'chef/api_client'
-
-# Delete a virtual machine from vCenter
-class Chef::Knife::VsphereVmDelete < Chef::Knife::BaseVsphereCommand
-
-	banner "knife vsphere vm delete VMNAME"
-
-	option :purge,
-		:short => "-P",
-		:long => "--purge",
-		:boolean => true,
-		:description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the EC2 node itself."
-
-	get_common_options
-
-	# Extracted from Chef::Knife.delete_object, because it has a
-	# confirmation step built in... By specifying the '--purge'
-	# flag (and also explicitly confirming the server destruction!)
-	# the user is already making their intent known. It is not
-	# necessary to make them confirm two more times.
-	def destroy_item(itemClass, name, type_name)
-		object = itemClass.load(name)
-		object.destroy
-		puts "Deleted #{type_name} #{name}"
-	end
-
-	def run
-		$stdout.sync = true
-
-		vmname = @name_args[0]
-
-		if vmname.nil?
-			show_usage
-			fatal_exit("You must specify a virtual machine name")
-		end
-
-		vim = get_vim_connection
-
-		baseFolder = find_folder(get_config(:folder));
-
-		vm = find_in_folder(baseFolder, RbVmomi::VIM::VirtualMachine, vmname) or
-		fatal_exit("VM #{vmname} not found")
-
-		vm.PowerOffVM_Task.wait_for_completion unless vm.runtime.powerState == "poweredOff"
-		vm.Destroy_Task
-		puts "Deleted virtual machine #{vmname}"
-
-		if config[:purge]
-			destroy_item(Chef::Node, vmname, "node")
-			destroy_item(Chef::ApiClient, vmname, "client")
-		else
-			puts "Corresponding node and client for the #{vmname} server were not deleted and remain registered with the Chef Server"
-		end
-	end
-end
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/BaseVsphereCommand'
+require 'rbvmomi'
+
+# These two are needed for the '--purge' deletion case
+require 'chef/node'
+require 'chef/api_client'
+
+# Delete a virtual machine from vCenter
+class Chef::Knife::VsphereVmDelete < Chef::Knife::BaseVsphereCommand
+
+	banner "knife vsphere vm delete VMNAME"
+
+	option :purge,
+		:short => "-P",
+		:long => "--purge",
+		:boolean => true,
+		:description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the VM itself."
+
+	get_common_options
+
+	# Extracted from Chef::Knife.delete_object, because it has a
+	# confirmation step built in... By specifying the '--purge'
+	# flag (and also explicitly confirming the server destruction!)
+	# the user is already making their intent known. It is not
+	# necessary to make them confirm two more times.
+	def destroy_item(itemClass, name, type_name)
+		object = itemClass.load(name)
+		object.destroy
+		puts "Deleted #{type_name} #{name}"
+	end
+
+	def run
+		$stdout.sync = true
+
+		vmname = @name_args[0]
+
+		if vmname.nil?
+			show_usage
+			fatal_exit("You must specify a virtual machine name")
+		end
+
+		vim = get_vim_connection
+
+		baseFolder = find_folder(get_config(:folder));
+
+		vm = find_in_folder(baseFolder, RbVmomi::VIM::VirtualMachine, vmname) or
+		fatal_exit("VM #{vmname} not found")
+
+		vm.PowerOffVM_Task.wait_for_completion unless vm.runtime.powerState == "poweredOff"
+		vm.Destroy_Task
+		puts "Deleted virtual machine #{vmname}"
+
+		if config[:purge]
+			destroy_item(Chef::Node, vmname, "node")
+			destroy_item(Chef::ApiClient, vmname, "client")
+		else
+			puts "Corresponding node and client for the #{vmname} server were not deleted and remain registered with the Chef Server"
+		end
+	end
+end

data/lib/chef/knife/vsphere_vm_query.rb

@@ -0,0 +1,51 @@
+
+# Author:: Ian Delahorne (<ian@delahorne.com>)
+# License:: Apache License, Version 2.0
+
+require 'chef/knife'
+require 'chef/knife/BaseVsphereCommand'
+require 'rbvmomi'
+require 'netaddr'
+
+class Chef::Knife::VsphereVmQuery < Chef::Knife::BaseVsphereCommand
+  banner "knife vsphere vm query VMNAME QUERY.  See \"http://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.VirtualMachine.html\" for allowed QUERY values."
+
+  get_common_options
+
+  def run
+    $stdout.sync = true
+    vmname = @name_args[0]
+    if vmname.nil?
+      show_usage
+      fatal_exit("You must specify a virtual machine name")
+    end
+
+    query_string = @name_args[1]
+    if query_string.nil?
+      show_usage
+      fatal_exit("You must specify a QUERY value (e.g. guest.ipAddress or network[0].name)")
+    end
+
+    vim = get_vim_connection
+
+    dcname = get_config(:vsphere_dc)
+    dc = vim.serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
+    folder = find_folder(get_config(:folder)) || dc.vmFolder
+
+    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) or
+      abort "VM #{vmname} not found"
+
+    # split QUERY by dots, and walk the object model
+    query = query_string.split '.'
+    result = vm
+    query.each do |part|
+      message, index = part.split(/[\[\]]/)
+      unless result.respond_to? message.to_sym
+        fatal_exit("\"#{query_string}\" not recognized.")
+      end
+
+      result = index ? result.send(message)[index.to_i] : result.send(message)
+    end
+    puts result
+  end
+end

data/lib/chef/knife/vsphere_vm_state.rb

@@ -35,8 +35,13 @@ class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
     :long => "--wait-port PORT",
     :description => "Wait for VM to be accessible on a port"
 
+  option :shutdown,
+    :short => "-g",
+    :long => "--shutdown",
+    :description => "Guest OS shutdown"
+
   def run
-  
+
     $stdout.sync = true
 
     vmname = @name_args[0]
@@ -45,7 +50,7 @@ class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
       ui.fatal("You must specify a virtual machine name")
       exit 1
     end
-   
+
     vim = get_vim_connection
 
     baseFolder = find_folder(get_config(:folder));
@@ -71,8 +76,18 @@ class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
         if state == PsOff
           puts "Virtual machine #{vmname} was already powered off"
         else
-          vm.PowerOffVM_Task.wait_for_completion
-          puts "Powered off virtual machine #{vmname}"
+          if get_config(:shutdown)
+            vm.ShutdownGuest
+            print "Waiting for virtual machine #{vmname} to shut down..."
+            until vm.runtime.powerState == PsOff do
+              sleep 2
+              print "."
+            end
+            puts "done"
+          else
+            vm.PowerOffVM_Task.wait_for_completion
+            puts "Powered off virtual machine #{vmname}"
+          end
         end
       when 'suspend'
         if state == PowerStates['suspended']
@@ -88,7 +103,7 @@ class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
 
       if get_config(:wait_port)
         print "Waiting for port #{get_config(:wait_port)}..."
-        print "." until tcp_test_port(vmname,get_config(:wait_port))
+        print "." until tcp_test_port_vm(vm,get_config(:wait_port))
         puts "done"
       end
     end

data/lib/knife-vsphere/version.rb

@@ -1,4 +1,4 @@
 module KnifeVsphere
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end
 

metadata

@@ -2,7 +2,7 @@
 name: knife-vsphere
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors: 
 - Ezra Pagel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-06 00:00:00 -05:00
+date: 2013-08-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,14 +65,15 @@ files:
 - lib/chef/knife/vsphere_vm_delete.rb
 - lib/chef/knife/vsphere_vm_execute.rb
 - lib/chef/knife/vsphere_vm_list.rb
+- lib/chef/knife/vsphere_vm_query.rb
 - lib/chef/knife/vsphere_vm_snapshot.rb
 - lib/chef/knife/vsphere_vm_state.rb
 - lib/chef/knife/vsphere_vm_vmdk_add.rb
 - lib/knife-vsphere/version.rb
 has_rdoc: true
 homepage: http://github.com/ezrapagel/knife-vsphere
-licenses: []
-
+licenses: 
+- Apache
 post_install_message: 
 rdoc_options: []