knife-esx 0.2 → 0.2.1

data/CHANGELOG.md

@@ -1,8 +1,8 @@
 # 0.2 - 2012/02/28
 
-* Added --batch and --async options 
+* **Added --batch and --async options**
 
-Inspired by spiceweasel from Matt Ray (https://github.com/mattray/spiceweasel), I've added a batch mode where a YAML file describes the VMs you want to bootstrap.
+Inspired by spiceweasel from Matt Ray (https://github.com/mattray/spiceweasel), I've added a batch mode where a YAML file describes the VMs you want to bootstrap and where (you can deploy to multiple hypervisors).
     
     knife esx vm create --batch batch.yml 
 
@@ -43,23 +43,26 @@ If you want to bootstrap the VMs asynchronously, use the --async flag.
 
     knife esx vm create --batch batch.yml --async
 
-Standard output and error log is redirected to /tmp/knife_esx_vm_create_VMNAME.log, so if we use the deploy script from above, three log files will be created:
+When using batch mode, standard output and error is redirected to /tmp/knife_esx_vm_create_VMNAME.log, so if we use the deploy script from above, three log files will be created:
 
     /tmp/knife_esx_vm_create_test1.log
     /tmp/knife_esx_vm_create_test2.log
     /tmp/knife_esx_vm_create_test3.log
 
-* Added --skip-bootstrap flag. If the flag is used the VM will be created but 
+* **Added --skip-bootstrap flag**
+
+If the flag is used the VM will be created but 
   the bootstrap template/script won't be executed (it also means that Chef won't be installed).
 
-* Fixed bug preventing knife-esx to create a VM when the hypervisor has an empty root password.
+* **Fixed bug preventing knife-esx to create a VM when the hypervisor has an empty root password.**
+
+**KNOWN ISSUES**
 
-KNOWN ISSUES
 * To use --batch without --skip-bootstrap, the ssh user (--ssh-user) needs to be able to sudo without asking for a password (i.e. adding something like 'ubuntu ALL=(ALL) NOPASSWD: ALL' to /etc/sudoers in the appliance template) otherwise the bootstraping process won't work if more than one VM is being deployed. 
 
 # 0.1.5 - 2012/02/25
 
-* Patch from @pperezrubio adding multiple networks support
+* **Patch from @pperezrubio adding multiple networks and fixed MAC address support**
 
     knife esx vm create --vm-disk ubuntu-oneiric.vmdk \
                         --vm-name testvm --datastore datastore1 \

data/lib/chef/knife/esx_vm_create.rb

@@ -20,6 +20,7 @@ require 'chef/knife/esx_base'
 require 'open4'
 require 'celluloid'
 require 'singleton'
+require 'yaml'
 
 module KnifeESX
   class DeployScript
@@ -108,18 +109,18 @@ module KnifeESX
         optstring << "   - #{k}:".ljust(25) +  "#{v}\n" unless k =~ /password/
       end
       log_file = "/tmp/knife_esx_vm_create_#{@name.to_s.strip.chomp.gsub(/\s/,'_')}.log"
-      CLogger.instance.info! "Bootstrapping VM #{@name} \n#{optstring.join}"
-      CLogger.instance.info! "VM #{@name} bootstrap log: #{log_file}"
+      KnifeESX::CLogger.instance.info! "Bootstrapping VM #{@name} \n#{optstring.join}"
+      KnifeESX::CLogger.instance.info! "VM #{@name} bootstrap log: #{log_file}"
       @status = Open4.popen4("knife esx vm create --vm-name #{@name} #{args} #{extra_args} > #{log_file} 2>&1") do |pid, stdin, stdout, stderr|
         @out << stdout.read.strip
         @err << stderr.read.strip
       end
       if @status == 0
-        CLogger.instance.info! "[#{@name}] deployment finished OK"
+        KnifeESX::CLogger.instance.info! "[#{@name}] deployment finished OK"
       else
-        CLogger.instance.error! "[#{@name}] deployment FAILED"
+        KnifeESX::CLogger.instance.error! "[#{@name}] deployment FAILED"
         @err.each_line do |l|
-          CLogger.instance.error! "[#{@name}] #{l.chomp}"
+          KnifeESX::CLogger.instance.error! "[#{@name}] #{l.chomp}"
         end
       end
       return @status, @out, @err 
@@ -280,7 +281,7 @@ class Chef
         $stdout.sync = true
         
         if config[:batch]
-          CLogger.instance.info "Running in batch mode. Extra arguments will be ignored."
+          KnifeESX::CLogger.instance.info "Running in batch mode. Extra arguments will be ignored."
           if not config[:async]
             counter = 0
             script = KnifeESX::DeployScript.new(config[:batch])
@@ -288,17 +289,17 @@ class Chef
               counter += 1
               status, stdout, stderr = job.run
               if status == 0 
-                CLogger.instance.info 'Ok'
+                KnifeESX::CLogger.instance.info 'Ok'
               else
-                CLogger.instance.error 'Failed'
+                KnifeESX::CLogger.instance.error 'Failed'
                 stderr.each_line do |l|
                   ui.error l
                 end
               end
             end
           else
-            CLogger.instance.info! "Asynchronous boostrapping selected"
-            CLogger.instance.info! "Now do something productive while I finish my job ;)"
+            KnifeESX::CLogger.instance.info! "Asynchronous boostrapping selected"
+            KnifeESX::CLogger.instance.info! "Now do something productive while I finish my job ;)"
             script = KnifeESX::DeployScript.new(config[:batch])
             futures = []
             script.each_job do |job|

data/lib/knife-esx/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module ESX 
-    VERSION = "0.2"
+    VERSION = "0.2.1"
     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'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: esx
-  requirement: &12088940 !ruby/object:Gem::Requirement
+  requirement: &19203900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *12088940
+  version_requirements: *19203900
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &12088520 !ruby/object:Gem::Requirement
+  requirement: &19203400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12088520
+  version_requirements: *19203400
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &12087940 !ruby/object:Gem::Requirement
+  requirement: &19202600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *12087940
+  version_requirements: *19202600
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &12087280 !ruby/object:Gem::Requirement
+  requirement: &19201620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *12087280
+  version_requirements: *19201620
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &12086840 !ruby/object:Gem::Requirement
+  requirement: &19530300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12086840
+  version_requirements: *19530300
 description: ESX Support for Chef's Knife Command
 email:
 - rubiojr@frameos.org
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: ESX Support for Chef's Knife Command