knife-esx 0.3.2 → 0.3.3

data/CHANGELOG.md

@@ -1,14 +1,10 @@
-# 0.3.2 - 2012/03/28
-
-* --vm-disk no longer mandatory. Fixes --batch mode.
-
 # 0.3.1 - 2012/03/26
 
 * Minor string change
 
 # 0.3.0 - 2012/03/26
 
-* Added template commands
+Added template commands
 
 ```
     knife esx template import --esx-password password \
@@ -23,7 +19,7 @@
                               template.vmdk
 ```
 
-* Added --use-template argument to *vm create* command
+Added --use-template argument to *vm create* command
 
 ```
     knife esx vm create --esx-password password \
@@ -34,7 +30,7 @@
 
 ## Create a new VM using templates
 
-1. Import the template first with "knife esx template import"
+1.Import the template first with "knife esx template import"
 
 ```
     knife esx template import --esx-host esx-test-host \
@@ -42,7 +38,7 @@
                               /path/to/template.vmdk
 ```
 
-2. Deploy using knife esx vm create
+2.Deploy using knife esx vm create
 
 ```
     knife esx vm create --esx-host esx-test-host \
@@ -53,7 +49,7 @@
 
 ## Using templates with async batch deploys
 
-1. Import the template first with "knife esx template import"
+1.Import the template first with "knife esx template import"
 
 ```
     knife esx template import --esx-host esx-test-host \
@@ -61,8 +57,8 @@
                               /path/to/template.vmdk
 ```
 
-2. Deploy using knife esx vm create --async --batch
-   Sample batch config for "knife esx vm create":
+2.Deploy using knife esx vm create --async --batch
+Sample batch config for "knife esx vm create":
 
 ```
     ---

data/README.rdoc

@@ -40,6 +40,16 @@ You also have the option of passing your ESX Host/Username/Password into the ind
                         --esx-host my-test-host \
                         --esx-password secret
 
+    #provision a new ubuntu 12.04 VM using a template on the ESXi Host with the --use-template option 
+    #- the command assumes that you have an ubuntu template located at /vmfs/volumes/datastore1/esx-gem/templates/ubuntu12.04-template-x64.vmdk. 
+    #In this example we also changed the location of the datastore from the default datastore1 to datastore2
+    knife esx vm create --esx-username root \
+                        --vm-name ubuntu-12.04-vm \
+                        --datastore datastore2 \
+                        --esx-host server1 \
+                        --esx-password secret \
+                        --use-template ubuntu12.04-template-x64.vmdk
+
 = SUBCOMMANDS:
 
 This plugin provides the following Knife subcommands.  Specific command options can be found by invoking the subcommand with a <tt>--help</tt> flag

data/knife-esx.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "knife-esx"
   s.version     = Knife::ESX::VERSION
   s.has_rdoc = true
-  s.authors     = ["Sergio Rubio"]
-  s.email       = ["rubiojr@frameos.org","rubiojr@frameos.org"]
+  s.authors     = ["Sergio Rubio", "Massimo Maino"]
+  s.email       = ["rubiojr@frameos.org","rubiojr@frameos.org","maintux@gmail.com"]
   s.homepage = "http://github.com/rubiojr/knife-esx"
   s.summary = "ESX Support for Chef's Knife Command"
   s.description = s.summary
@@ -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.4.1"
+  s.add_dependency "esx", ">= 0.4.2"
   s.add_dependency "terminal-table"
   s.add_dependency "chef", ">= 0.10"
   s.add_dependency "celluloid", ">= 0.9"

data/lib/chef/knife/esx_base.rb

@@ -52,6 +52,24 @@ class Chef
             :description => "Your ESX host address",
             :default => "127.0.0.1",
             :proc => Proc.new { |host| Chef::Config[:knife][:esx_host] = host }
+            
+          option :free_license,
+            :long => "--free-license",
+            :description => "If your Hypervisor have a free license",
+            :boolean => true,
+            :default => false
+            
+          option :insecure,
+            :long => "--insecure",
+            :description => "Insecure connection",
+            :boolean => true,
+            :default => true
+
+          option :esx_templates_dir,
+            :long => "--esx-templates-dir TEMPLATES_DIRECTORY",
+            :description => "Your ESX Templates directory",
+            :default => "",
+            :proc => Proc.new { |templates_dir| Chef::Config[:knife][:esx_templates_dir] = templates_dir }
         end
       end
 
@@ -61,7 +79,9 @@ class Chef
           ui.info "#{ui.color("Connecting to ESX host #{config[:esx_host]}... ", :magenta)}"
           @connection = ESX::Host.connect(Chef::Config[:knife][:esx_host],
                                           Chef::Config[:knife][:esx_username],
-                                          Chef::Config[:knife][:esx_password] || '')
+                                          Chef::Config[:knife][:esx_password] || '',
+                                          config[:insecure],
+                                          {:templates_dir => Chef::Config[:knife][:esx_templates_dir], :free_license=>config[:free_license]})
         else
           @connection
         end

data/lib/chef/knife/esx_vm_create.rb

@@ -85,6 +85,9 @@ module KnifeESX
       if @name.nil? or @name.empty?
         raise Exception.new("Invalid job name")
       end
+      if not @options['vm-disk'] or !File.exist?(@options['vm-disk'])
+        raise Exception.new("Invalid VM disk for job #{@name}.")
+      end
     end
 
     # returns [status, stdout, stderr]
@@ -150,8 +153,12 @@ class Chef
 
       option :vm_name,
         :long => "--vm-name NAME",
-        :description => "The Virtual Machine name"
-      
+        :description => "The Virtual Machine name"    
+
+      option :cpus,
+        :long => "--vm-cpus CPUS",
+        :description => "The Virtual Machine cpus (default: 1)"
+
       option :datastore,
         :long => "--datastore NAME",
         :default => 'datastore1',
@@ -206,6 +213,13 @@ class Chef
         :proc => lambda { |o| o.split(/[\s,]+/) },
         :default => []
 
+      option :json_attributes,
+        :short => "-j JSON_ATTRIBUTES",
+        :long => "--json-attributes JSON_ATTRIBUTES",
+        :description => "A JSON string to be added to the first run of chef-client",
+        :proc => lambda { |o| JSON.parse(o) },
+        :default => {}
+
       option :ssh_user,
         :short => "-x USERNAME",
         :long => "--ssh-user USERNAME",
@@ -335,6 +349,7 @@ class Chef
           
         datastore = config[:datastore]
         memory = config[:memory]
+        cpus = config[:cpus]||1
         vm_disk = config[:vm_disk]
         guest_id =config[:guest_id]
         destination_path = "/vmfs/volumes/#{datastore}/#{vm_name}"
@@ -359,6 +374,7 @@ class Chef
                              :datastore => datastore,
                              :disk_file => "#{vm_name}/#{vm_name}.vmdk",
                              :memory => memory,
+                             :cpus => cpus,
                              :guest_id => guest_id,
                              :nics => create_nics(config[:vm_network], config[:mac_address])
         vm.power_on
@@ -404,6 +420,7 @@ class Chef
         bootstrap.name_args = [vm.ip_address]
         bootstrap.config[:async] = config[:async]
         bootstrap.config[:run_list] = config[:run_list]
+        bootstrap.config[:first_boot_attributes] = config[:json_attributes]
         bootstrap.config[:ssh_user] = config[:ssh_user] 
         bootstrap.config[:identity_file] = config[:identity_file]
         bootstrap.config[:chef_node_name] = config[:chef_node_name] || vm.name

data/lib/chef/knife/esx_vm_delete.rb

@@ -43,6 +43,9 @@ class Chef
               vm.power_off if (vm.name =~ /#{vm.name}/ and vm.power_state == 'poweredOn')
               vm.destroy
               deleted << vm_name
+              #Assume yes because the user already confirmed the deletion
+              system "knife client delete #{vm.name} -y"
+              system "knife node delete #{vm.name} -y"
               ui.info("Deleted virtual machine #{vm.name}")
             end
           end

data/lib/knife-esx/version.rb

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

metadata

@@ -1,30 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: knife-esx
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
 - Sergio Rubio
+- Massimo Maino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: esx
-  requirement: &9726400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *9726400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &9724440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9724440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &9721740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,15 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *9721740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &9718600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +70,15 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *9718600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &9717280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,11 +86,17 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9717280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ESX Support for Chef's Knife Command
 email:
 - rubiojr@frameos.org
 - rubiojr@frameos.org
+- maintux@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -112,8 +139,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ESX Support for Chef's Knife Command
-test_files: []
+test_files:
+- features/esx.feature
+- features/foo
+- features/step_definitions/steps.rb
+- features/support/env.rb