knife-vsphere 0.2.3 → 0.3.0

data/lib/chef/knife/BaseVsphereCommand.rb

@@ -38,7 +38,7 @@ class Chef
 					:description => "The password for vsphere"
 
 				option :vsphere_host,
-					:long => "--vshost",
+					:long => "--vshost HOST",
 					:description => "The vsphere host"
 
 				option :vsphere_dc,

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -167,7 +167,6 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 			show_usage
 			fatal_exit("You must specify a virtual machine name")
 		end
-		config[:fqdn] = vmname unless config[:fqdn]
 		config[:chef_node_name] = vmname unless config[:chef_node_name]
 		config[:vmname] = vmname
 
@@ -204,6 +203,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 		end
 
 		if get_config(:bootstrap)
+			sleep 2 until vm.guest.ipAddress
+			config[:fqdn] = vm.guest.ipAddress unless config[:fqdn]
 			print "Waiting for sshd..."
 			print "." until tcp_test_ssh(config[:fqdn])
 			puts "done"

data/lib/chef/knife/vsphere_vm_execute.rb

@@ -0,0 +1,68 @@
+
+# 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::VsphereVmExecute < Chef::Knife::BaseVsphereCommand
+  banner "knife vsphere vm execute VMNAME COMMAND ARGS"
+
+  option :exec_user, 
+    :long => "--exec-user USER",
+    :description => "User to execute as",
+    :required => true
+
+  option :exec_passwd,
+    :long => "--exec-passwd PASSWORD",
+    :description => "Password for execute user",
+    :required => true
+  
+  option :exec_dir, 
+    :long => "--exec-dir DIRECTORY",
+    :description => "Working directory to execute in"
+
+  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
+    command = @name_args[1]
+    if command.nil?
+      show_usage
+      fatal_exit("You must specify a command to execute")
+    end
+
+    args = @name_args[2]
+    if args.nil?
+      args = ""
+    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"
+ 
+    gom = vim.serviceContent.guestOperationsManager
+
+    guest_auth = RbVmomi::VIM::NamePasswordAuthentication(:interactiveSession => false, 
+                                                          :username => config[:exec_user],
+                                                          :password => config[:exec_passwd])
+    prog_spec = RbVmomi::VIM::GuestProgramSpec(:programPath => command,
+                                               :arguments => args,
+                                               :workingDirectory => get_config(:exec_dir))
+    
+    gom.processManager.StartProgramInGuest(:vm => vm, :auth => guest_auth, :spec => prog_spec)
+
+  end
+end

data/lib/knife-vsphere/version.rb

@@ -1,4 +1,4 @@
 module KnifeVsphere
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 -05:00
+date: 2012-10-18 00:00:00.000000000 -05:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
-  requirement: &70275405040840 !ruby/object:Gem::Requirement
+  requirement: &70142499693560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70275405040840
+  version_requirements: *70142499693560
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70275405038940 !ruby/object:Gem::Requirement
+  requirement: &70142499693040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70275405038940
+  version_requirements: *70142499693040
 - !ruby/object:Gem::Dependency
   name: rbvmomi
-  requirement: &70275405038180 !ruby/object:Gem::Requirement
+  requirement: &70142499692440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70275405038180
+  version_requirements: *70142499692440
 description: VMware vSphere Support for Chef's Knife Command
 email: ezra@cpan.org
 executables: []
@@ -59,6 +59,7 @@ files:
 - lib/chef/knife/vsphere_vlan_list.rb
 - lib/chef/knife/vsphere_vm_clone.rb
 - 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_state.rb
 - lib/knife-vsphere/version.rb