knife-esx 0.2.1 → 0.3

data/CHANGELOG.md

@@ -1,3 +1,75 @@
+# 0.3.0 - 2012/03/26
+
+* Added template commands
+
+    knife esx template import --esx-password password \
+                            --esx-host esx-test-host \
+                            /path/to/template.vmdk
+    
+    knife esx template list --esx-password password \
+                            --esx-host esx-test-host 
+
+    knife esx template delete --esx-password password \
+                              --esx-host esx-test-host \
+                              template.vmdk
+
+* Added --use-template argument to *vm create* command
+
+    knife esx vm create --esx-password password \
+                        --esx-host esx-test-host \
+                        --use-template template.vmdk \
+                        my-new-vm
+    
+## Create a new VM using templates
+
+1. Import the template first with "knife esx template import"
+
+    knife esx template import --esx-host esx-test-host \
+                              --esx-password password \
+                              /path/to/template.vmdk
+
+2. Deploy using knife esx vm create
+
+    knife esx vm create --esx-host esx-test-host \
+                        --esx-password password \
+                        --vm-name my-foo-vm \
+                        --use-template template.vmdk
+
+## Using templates with async batch deploys
+
+1. Import the template first with "knife esx template import"
+
+    knife esx template import --esx-host esx-test-host \
+                              --esx-password password \
+                              /path/to/template.vmdk
+
+2. Deploy using knife esx vm create --async --batch
+   Sample batch config for "knife esx vm create":
+
+    ---
+    :tc01:
+      'use-template': template.vmdk
+      'extra-args': --no-host-key-verify 
+      'vm-memory': 128
+      'esx-host': esx-test-host
+      'esx-password': password
+      'ssh-user': ubuntu
+      'ssh-password': ubuntu
+      'datastore': datastore1
+    :tc02:
+      'use-template': template.vmdk
+      'extra-args': --no-host-key-verify 
+      'vm-memory': 128
+      'esx-host': esx-test-host
+      'esx-password': password
+      'ssh-user': ubuntu
+      'ssh-password': ubuntu
+      'datastore': datastore1
+
+# 0.2.1 - 2012/02/28
+
+* Fixed namespaces
+
 # 0.2 - 2012/02/28
 
 * **Added --batch and --async options**

data/knife-esx.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.add_dependency "esx", ">= 0.3.2"
+  s.add_dependency "esx", ">= 0.4.1"
   s.add_dependency "terminal-table"
   s.add_dependency "chef", ">= 0.10"
   s.add_dependency "celluloid", ">= 0.9"

data/lib/chef/knife/esx_template_delete.rb

@@ -0,0 +1,55 @@
+#
+# Author:: Sergio Rubio (<rubiojr@frameos.org>)
+# Copyright:: Copyright (c) 2011 Sergio Rubio
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife/esx_base'
+
+class Chef
+  class Knife
+    class EsxTemplateDelete < Knife
+
+      include Knife::ESXBase
+
+      banner "knife esx template delete TEMPLATE_NAME [TEMPLATE_NAME] (options)"
+
+      option :force_delete,
+        :long => "--force-delete NO",
+        :default => 'no',
+        :description => "Do not confirm VM deletion when yes"
+
+      def run
+        deleted = []
+        connection.list_templates.each do |tmpl|
+          @name_args.each do |tmpl_name|
+            if tmpl_name == File.basename(tmpl)
+              if config[:force_delete] !~ /true|yes/i
+                confirm("Do you really want to delete this template '#{tmpl_name}'")
+              end
+              connection.delete_template tmpl_name
+              deleted << tmpl_name
+              ui.info("Deleted virtual machine #{tmpl_name}")
+            end
+          end
+        end
+        @name_args.each do |tmpl_name|
+          ui.warn "Template #{tmpl_name} not found" if not deleted.include?(tmpl_name)
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/knife/esx_template_import.rb

@@ -0,0 +1,42 @@
+#
+# Author:: Sergio Rubio (<rubiojr@frameos.org>)
+# Copyright:: Copyright (c) 2011 Sergio Rubio
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife/esx_base'
+
+class Chef
+  class Knife
+    class EsxTemplateImport < Knife
+
+      include Knife::ESXBase
+
+      banner "knife esx template import TEMPLATE_FILE"
+
+      def run
+        $stdout.sync = true
+        @name_args.each do |vm_name|
+          if not File.exist?(vm_name)
+            ui.error("The file #{vm_name} does not exist.")
+            exit 1
+          end
+          connection.import_template vm_name, :print_progress => true
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/knife/esx_template_list.rb

@@ -0,0 +1,42 @@
+#
+# Author:: Sergio Rubio (<rubiojr@frameos.org>)
+# Copyright:: Copyright (c) 2011 Sergio Rubio
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife/esx_base'
+
+class Chef
+  class Knife
+    class EsxTemplateList < Knife
+
+      include Knife::ESXBase
+
+      banner "knife esx template list"
+
+      def run
+        $stdout.sync = true
+        table = table do |t|
+          t.headings = %w{DISK_TEMPLATES}
+          connection.list_templates.each do |tmpl|
+            t << [File.basename(tmpl)]
+          end
+        end
+        puts table
+      end
+
+    end
+  end
+end

data/lib/chef/knife/esx_vm_create.rb

@@ -197,6 +197,11 @@ class Chef
         :proc => Proc.new { |t| Chef::Config[:knife][:template_file] = t },
         :default => false
 
+      option :use_template,
+        :long => "--use-template NAME",
+        :description => "Try to use an existing template instead of importing disk",
+        :default => nil
+      
       option :run_list,
         :short => "-r RUN_LIST",
         :long => "--run-list RUN_LIST",
@@ -312,14 +317,16 @@ class Chef
           return
         end
 
-        unless config[:vm_disk]
-          ui.error("You have not provided a valid VMDK file. (--vm-disk)")
-          exit 1
-        end
-        
-        if not File.exist?(config[:vm_disk])
-          ui.error("Invalid VMDK disk file (--vm-disk)")
-          exit 1
+        if not config[:use_template]
+          unless config[:vm_disk]
+            ui.error("You have not provided a valid VMDK file. (--vm-disk)")
+            exit 1
+          end
+          
+          unless File.exist?(config[:vm_disk])
+            ui.error("Invalid VMDK disk file (--vm-disk)")
+            exit 1
+          end
         end
         
         vm_name = config[:vm_name]
@@ -336,10 +343,21 @@ class Chef
         destination_path = "/vmfs/volumes/#{datastore}/#{vm_name}"
 
         connection.remote_command "mkdir #{destination_path}"
-        puts "#{ui.color("Creating VM #{vm_name}... ", :magenta)}"
-        puts "#{ui.color("Importing VM disk... ", :magenta)}"
+        ui.info "Creating VM #{vm_name}"
 
-        connection.import_disk vm_disk, destination_path + "/#{vm_name}.vmdk"
+        if config[:use_template]
+          ui.info "Using template #{config[:use_template]}"
+          if connection.template_exist?(config[:use_template])
+            puts "#{ui.color("Cloning template...",:magenta)}"
+            connection.copy_from_template config[:use_template], destination_path + "/#{vm_name}.vmdk"
+          else
+            ui.error "Template #{config[:use_template]} not found"
+            exit 1
+          end
+        else
+          puts "#{ui.color("Importing VM disk... ", :magenta)}"
+          connection.import_disk vm_disk, destination_path + "/#{vm_name}.vmdk"
+        end
         vm = connection.create_vm :vm_name => vm_name,
                              :datastore => datastore,
                              :disk_file => "#{vm_name}/#{vm_name}.vmdk",
@@ -348,6 +366,7 @@ class Chef
                              :nics => create_nics(config[:vm_network], config[:mac_address])
         vm.power_on
         
+        puts "#{ui.color("VM Created", :cyan)}"
         puts "#{ui.color("VM Name", :cyan)}: #{vm.name}"
         puts "#{ui.color("VM Memory", :cyan)}: #{(vm.memory_size.to_f/1024/1024).round} MB"
         

data/lib/chef/knife/esx_vm_delete.rb

@@ -36,14 +36,14 @@ class Chef
         connection.virtual_machines.each do |vm|
           @name_args.each do |vm_name|
             if vm_name == vm.name
-              if config[:force_delete] != 'yes'
+              if config[:force_delete] =~ /(no|NO|false|FALSE)/
                 confirm("Do you really want to delete this virtual machine '#{vm.name}'")
               end
 
               vm.power_off if (vm.name =~ /#{vm.name}/ and vm.power_state == 'poweredOn')
               vm.destroy
               deleted << vm_name
-              ui.warn("Deleted virtual machine #{vm.name}")
+              ui.info("Deleted virtual machine #{vm.name}")
             end
           end
         end

data/lib/knife-esx/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module ESX 
-    VERSION = "0.2.1"
+    VERSION = "0.3"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-esx
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-28 00:00:00.000000000 Z
+date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: esx
-  requirement: &19203900 !ruby/object:Gem::Requirement
+  requirement: &19768260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *19203900
+  version_requirements: *19768260
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &19203400 !ruby/object:Gem::Requirement
+  requirement: &19766280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19203400
+  version_requirements: *19766280
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &19202600 !ruby/object:Gem::Requirement
+  requirement: &19763120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *19202600
+  version_requirements: *19763120
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &19201620 !ruby/object:Gem::Requirement
+  requirement: &19754700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *19201620
+  version_requirements: *19754700
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &19530300 !ruby/object:Gem::Requirement
+  requirement: &19753280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19530300
+  version_requirements: *19753280
 description: ESX Support for Chef's Knife Command
 email:
 - rubiojr@frameos.org
@@ -85,6 +85,9 @@ files:
 - features/support/env.rb
 - knife-esx.gemspec
 - lib/chef/knife/esx_base.rb
+- lib/chef/knife/esx_template_delete.rb
+- lib/chef/knife/esx_template_import.rb
+- lib/chef/knife/esx_template_list.rb
 - lib/chef/knife/esx_vm_create.rb
 - lib/chef/knife/esx_vm_delete.rb
 - lib/chef/knife/esx_vm_list.rb