knife-vsphere 0.9.9 → 1.0.0.pre

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -30,6 +30,10 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
          :long => "--datastore STORE",
          :description => "The datastore into which to put the cloned VM"
 
+  option :datastorecluster,
+         :long => "--datastorecluster STORE",
+         :description => "The datastorecluster into which to put the cloned VM"
+
   option :resource_pool,
          :long => "--resource-pool POOL",
          :description => "The resource pool into which to put the cloned VM"
@@ -303,10 +307,24 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:diskMoveType => :moveChildMostDiskBacking)
     end
 
+    if get_config(:datastore) && get_config(:datastorecluster)
+      abort "Please select either datastore or datastorecluster"
+    end
+
     if get_config(:datastore)
       rspec.datastore = find_datastore(get_config(:datastore))
     end
 
+    if get_config(:datastorecluster)
+      dsc = find_datastorecluster(get_config(:datastorecluster))
+
+      dsc.childEntity.each do |store|
+        if (rspec.datastore == nil or rspec.datastore.summary[:freeSpace] < store.summary[:freeSpace])
+          rspec.datastore = store
+        end
+      end
+    end
+
     clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => rspec,
                                                       :powerOn => false,
                                                       :template => false)
@@ -393,11 +411,11 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
         cust_spec.identity = ident
       end
 
+      clone_spec.customization = cust_spec
+
       if customization_plugin && customization_plugin.respond_to?(:customize_clone_spec)
         clone_spec = customization_plugin.customize_clone_spec(src_config, clone_spec)
       end
-
-      clone_spec.customization = cust_spec
     end
     clone_spec
   end

data/lib/chef/knife/vsphere_vm_execute.rb

@@ -1,66 +1,66 @@
-# Author:: Ian Delahorne (<ian@delahorne.com>)
-# License:: Apache License, Version 2.0
-
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-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
-
-    dc = get_datacenter
-    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
+# Author:: Ian Delahorne (<ian@delahorne.com>)
+# License:: Apache License, Version 2.0
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+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
+
+    dc = get_datacenter
+    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/chef/knife/vsphere_vm_markastemplate.rb

@@ -0,0 +1,54 @@
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# Contributor:: Jesse Campbell (<hikeit@gmail.com>)
+# Contributor:: Bethany Erskine (<bethany@paperlesspost.com>)
+# Contributor:: Adrian Stanila (https://github.com/sacx)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+
+# Clone an existing template into a new VM, optionally applying a customization specification.
+# usage:
+# knife vsphere vm markastemplate MyVM --folder /templates
+class Chef::Knife::VsphereVmMarkastemplate < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere vm markastemplate VMNAME"
+
+  get_common_options
+
+  option :folder,
+         :long => "--folder FOLDER",
+         :description => "The folder which contains the VM"
+
+  def run
+    $stdout.sync = true
+
+    vmname = @name_args[0]
+    if vmname.nil?
+      show_usage
+      fatal_exit("You must specify a virtual machine name")
+    end
+    config[:chef_node_name] = vmname unless config[:chef_node_name]
+    config[:vmname] = vmname
+
+    if get_config(:bootstrap) && get_config(:distro) && !@@chef_config_dir
+      fatal_exit("Can't find .chef for bootstrap files. chdir to a location with a .chef directory and try again")
+    end
+
+    vim = get_vim_connection
+
+    dc = get_datacenter
+
+    src_folder = find_folder(get_config(:folder)) || dc.vmFolder
+
+    vm = find_in_folder(src_folder, RbVmomi::VIM::VirtualMachine, config[:vmname]) or
+        abort "VM not found"
+
+    puts "Marking VM #{vmname} as template"
+    vm.MarkAsTemplate()
+    puts "Finished marking VM #{vmname} as template"
+  end
+end

data/lib/chef/knife/vsphere_vm_snapshot.rb

@@ -1,129 +1,129 @@
-#
-# License:: Apache License, Version 2.0
-#
-
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'rbvmomi'
-require 'netaddr'
-
-
-# Manage snapshots of a virtual machine
-class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
-
-  banner "knife vsphere vm snapshot VMNAME (options)"
-
-  get_common_options
-
-  option :list,
-         :long => "--list",
-         :description => "The current tree of snapshots"
-
-  option :create_new_snapshot,
-         :long => "--create SNAPSHOT",
-         :description => "Create a new snapshot off of the current snapshot."
-
-  option :remove_named_snapshot,
-         :long => "--remove SNAPSHOT",
-         :description => "Remove a named snapshot."
-
-  option :revert_snapshot,
-         :long => "--revert SNAPSHOT",
-         :description => "Revert to a named snapshot."
-
-  option :revert_current_snapshot,
-         :long => "--revert-current",
-         :description => "Revert to current snapshot.",
-         :boolean => false
-
-  option :power,
-         :long => "--start",
-         :description => "Indicates whether to start the VM after a successful revert",
-         :boolean => false
-
-  def run
-
-    $stdout.sync = true
-
-    vmname = @name_args[0]
-    if vmname.nil?
-      show_usage
-      ui.fatal("You must specify a virtual machine name")
-      exit 1
-    end
-
-    vim = get_vim_connection
-
-    baseFolder = find_folder(get_config(:folder));
-
-    vm = find_in_folder(baseFolder, RbVmomi::VIM::VirtualMachine, vmname) or
-        abort "VM #{vmname} not found"
-
-    if vm.snapshot
-      snapshot_list = vm.snapshot.rootSnapshotList
-      current_snapshot = vm.snapshot.currentSnapshot
-    end
-
-    if config[:list] && vm.snapshot
-      puts "Current snapshot tree: "
-      puts "#{vmname}"
-      snapshot_list.each { |i| puts display_node(i, current_snapshot) }
-    end
-
-    if config[:create_new_snapshot]
-      vm.CreateSnapshot_Task(:name => config[:create_new_snapshot], :description => "", :memory => false, :quiesce => false)
-    end
-
-    if config[:remove_named_snapshot]
-      ss_name = config[:remove_named_snapshot]
-      snapshot = find_node(snapshot_list, ss_name)
-      puts "Found snapshot #{ss_name} removing."
-      snapshot.RemoveSnapshot_Task(:removeChildren => false)
-    end
-
-    if config[:revert_current_snapshot]
-      puts "Reverting to Current Snapshot"
-      vm.RevertToCurrentSnapshot_Task(:suppressPowerOn => false).wait_for_completion
-      if get_config(:power)
-        vm.PowerOnVM_Task.wait_for_completion
-        puts "Powered on virtual machine #{vmname}"
-      end
-    end
-
-    if config[:revert_snapshot]
-      ss_name = config[:revert_snapshot]
-      snapshot = find_node(snapshot_list, ss_name)
-      snapshot.RevertToSnapshot_Task(:suppressPowerOn => false).wait_for_completion
-      if get_config(:power)
-        vm.PowerOnVM_Task.wait_for_completion
-        puts "Powered on virtual machine #{vmname}"
-      end
-    end
-  end
-
-  def find_node(tree, name)
-    snapshot = nil
-    tree.each do |node|
-      if node.name == name
-        snapshot = node.snapshot
-      elsif !node.childSnapshotList.empty?
-        snapshot = find_node(node.childSnapshotList, name)
-      end
-    end
-    return snapshot
-  end
-
-  def display_node(node, current, shift=1)
-    out = ""
-    out << "+--"*shift
-    if node.snapshot == current
-      out << "#{ui.color(node.name, :cyan)}" << "\n"
-    else
-      out << "#{node.name}" << "\n"
-    end
-    if !node.childSnapshotList.empty?
-      node.childSnapshotList.each { |item| out << display_node(item, current, shift+1) }
-    end
-    out
-  end
-end
+#
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+require 'netaddr'
+
+
+# Manage snapshots of a virtual machine
+class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere vm snapshot VMNAME (options)"
+
+  get_common_options
+
+  option :list,
+         :long => "--list",
+         :description => "The current tree of snapshots"
+
+  option :create_new_snapshot,
+         :long => "--create SNAPSHOT",
+         :description => "Create a new snapshot off of the current snapshot."
+
+  option :remove_named_snapshot,
+         :long => "--remove SNAPSHOT",
+         :description => "Remove a named snapshot."
+
+  option :revert_snapshot,
+         :long => "--revert SNAPSHOT",
+         :description => "Revert to a named snapshot."
+
+  option :revert_current_snapshot,
+         :long => "--revert-current",
+         :description => "Revert to current snapshot.",
+         :boolean => false
+
+  option :power,
+         :long => "--start",
+         :description => "Indicates whether to start the VM after a successful revert",
+         :boolean => false
+
+  def run
+
+    $stdout.sync = true
+
+    vmname = @name_args[0]
+    if vmname.nil?
+      show_usage
+      ui.fatal("You must specify a virtual machine name")
+      exit 1
+    end
+
+    vim = get_vim_connection
+
+    baseFolder = find_folder(get_config(:folder));
+
+    vm = find_in_folder(baseFolder, RbVmomi::VIM::VirtualMachine, vmname) or
+        abort "VM #{vmname} not found"
+
+    if vm.snapshot
+      snapshot_list = vm.snapshot.rootSnapshotList
+      current_snapshot = vm.snapshot.currentSnapshot
+    end
+
+    if config[:list] && vm.snapshot
+      puts "Current snapshot tree: "
+      puts "#{vmname}"
+      snapshot_list.each { |i| puts display_node(i, current_snapshot) }
+    end
+
+    if config[:create_new_snapshot]
+      vm.CreateSnapshot_Task(:name => config[:create_new_snapshot], :description => "", :memory => false, :quiesce => false)
+    end
+
+    if config[:remove_named_snapshot]
+      ss_name = config[:remove_named_snapshot]
+      snapshot = find_node(snapshot_list, ss_name)
+      puts "Found snapshot #{ss_name} removing."
+      snapshot.RemoveSnapshot_Task(:removeChildren => false)
+    end
+
+    if config[:revert_current_snapshot]
+      puts "Reverting to Current Snapshot"
+      vm.RevertToCurrentSnapshot_Task(:suppressPowerOn => false).wait_for_completion
+      if get_config(:power)
+        vm.PowerOnVM_Task.wait_for_completion
+        puts "Powered on virtual machine #{vmname}"
+      end
+    end
+
+    if config[:revert_snapshot]
+      ss_name = config[:revert_snapshot]
+      snapshot = find_node(snapshot_list, ss_name)
+      snapshot.RevertToSnapshot_Task(:suppressPowerOn => false).wait_for_completion
+      if get_config(:power)
+        vm.PowerOnVM_Task.wait_for_completion
+        puts "Powered on virtual machine #{vmname}"
+      end
+    end
+  end
+
+  def find_node(tree, name)
+    snapshot = nil
+    tree.each do |node|
+      if node.name == name
+        snapshot = node.snapshot
+      elsif !node.childSnapshotList.empty?
+        snapshot = find_node(node.childSnapshotList, name)
+      end
+    end
+    return snapshot
+  end
+
+  def display_node(node, current, shift=1)
+    out = ""
+    out << "+--"*shift
+    if node.snapshot == current
+      out << "#{ui.color(node.name, :cyan)}" << "\n"
+    else
+      out << "#{node.name}" << "\n"
+    end
+    if !node.childSnapshotList.empty?
+      node.childSnapshotList.each { |item| out << display_node(item, current, shift+1) }
+    end
+    out
+  end
+end