knife-esx 0.3.3 → 0.3.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 07692fab1cbe917363aa1eaa8ccd680e1f653604
+  data.tar.gz: d13e0a6c19719120c7a7d9294120d29067455de0
+SHA512:
+  metadata.gz: 885e8348b70109767be7436a7d601f00c769e148a193062b9c3b42758a8d8efb24d4969453018c21f42c1bba4a9c83ba42ed4a21b15210fcbe98131a05311435
+  data.tar.gz: cce8cc969042060ded5a6c6b1d3d2fdf0d836d4c6ca4f878b6d4b9930a3c218f1c32564f05c356d412594c922f0290e0e6c47e37e936c1dbf42cb0129650d584

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/CHANGELOG.md

@@ -10,9 +10,9 @@ 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 
+                            --esx-host esx-test-host
 
     knife esx template delete --esx-password password \
                               --esx-host esx-test-host \
@@ -64,7 +64,7 @@ Sample batch config for "knife esx vm create":
     ---
     :tc01:
       'use-template': template.vmdk
-      'extra-args': --no-host-key-verify 
+      'extra-args': --no-host-key-verify
       'vm-memory': 128
       'esx-host': esx-test-host
       'esx-password': password
@@ -73,7 +73,7 @@ Sample batch config for "knife esx vm create":
       'datastore': datastore1
     :tc02:
       'use-template': template.vmdk
-      'extra-args': --no-host-key-verify 
+      'extra-args': --no-host-key-verify
       'vm-memory': 128
       'esx-host': esx-test-host
       'esx-password': password
@@ -91,8 +91,8 @@ Sample batch config for "knife esx vm create":
 * **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 and where (you can deploy to multiple hypervisors).
-    
-    knife esx vm create --batch batch.yml 
+
+    knife esx vm create --batch batch.yml
 
 Sample batch.yml file:
 
@@ -100,29 +100,29 @@ Sample batch.yml file:
     :test1:
       'extra-args': --no-host-key-verify
       'vm-memory': 128
-      'esx-host': esx-server-1 
-      'esx-password': secret 
+      'esx-host': esx-server-1
+      'esx-password': secret
       'ssh-user': ubuntu
       'ssh-password': ubuntu
-      'vm-disk': /home/rubiojr/mnt/mirror/virtual_appliances/ubuntu1110-x64-vmware-tools.vmdk
+      'vm-disk': /home/maintux/mnt/mirror/virtual_appliances/ubuntu1110-x64-vmware-tools.vmdk
       'datastore': datastore2
     :test2:
-      'extra-args': --no-host-key-verify 
+      'extra-args': --no-host-key-verify
       'vm-memory': 128
-      'esx-host': esx-server-1 
+      'esx-host': esx-server-1
       'esx-password': secret
       'ssh-user': ubuntu
       'ssh-password': ubuntu
-      'vm-disk': /home/rubiojr/mnt/mirror/virtual_appliances/ubuntu1110-x64-vmware-tools.vmdk
+      'vm-disk': /home/maintux/mnt/mirror/virtual_appliances/ubuntu1110-x64-vmware-tools.vmdk
       'datastore': datastore2
     :test3:
-      'extra-args': --no-host-key-verify 
+      'extra-args': --no-host-key-verify
       'vm-memory': 256
-      'esx-host': esx-server-1 
+      'esx-host': esx-server-1
       'esx-password': secret
       'ssh-user': ubuntu
       'ssh-password': ubuntu
-      'vm-disk': /home/rubiojr/mnt/mirror/virtual_appliances/ubuntu1110-x64-vmware-tools.vmdk
+      'vm-disk': /home/maintux/mnt/mirror/virtual_appliances/ubuntu1110-x64-vmware-tools.vmdk
       'datastore': datastore2
 
 This will try to create three VMs (testvm1, testvm2 and testvm3) sequentially. VM definitions inside the batch file accept all the parameters that can be used with knife-esx.
@@ -139,14 +139,14 @@ When using batch mode, standard output and error is redirected to /tmp/knife_esx
 
 * **Added --skip-bootstrap flag**
 
-If the flag is used the VM will be created but 
+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.**
 
 **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. 
+* 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
 
@@ -161,7 +161,7 @@ If the flag is used the VM will be created but
 This will create a VM with two NICs, attaching them to the VLAN-Integration and VLAN-Test networks respectively.
 
 Fixed MAC addresses can also be assigned to each NIC using the --mac-address parameter:
-    
+
     knife esx vm create --vm-disk ubuntu-oneiric.vmdk \
                         --vm-name testvm --datastore datastore1 \
                         --esx-host 192.168.88.1 --ssh-user ubuntu \
@@ -172,7 +172,7 @@ Fixed MAC addresses can also be assigned to each NIC using the --mac-address par
 MAC address 00:01:02:03:04:05 will be assigned to VLAN-Integration NIC and 00:01:02:03:04:06 to the VLAN-Test NIC.
 
 If a MAC address is omitted it will be dynamically generated:
-    
+
 knife esx vm create --vm-disk ubuntu-oneiric.vmdk \
                         --vm-name testvm --datastore datastore1 \
                         --esx-host 192.168.88.1 --ssh-user ubuntu \

data/README.md

@@ -0,0 +1,167 @@
+# Knife ESX
+
+## DESCRIPTION:
+
+This is the unofficial Opscode Knife plugin for ESX. This plugin gives knife the ability to create, bootstrap, and manage virtual machines in a VMWare ESX/ESXi host.
+
+You'll need an ESX(i)4/5 host with SSH enabled and a privileged user account to connect to it via SSH.
+
+You'll also need a base VM template (a VMDK in fact) with CentOS/Ubuntu/Fedora and vmware-tools installed.
+
+If you're using VMWare ESXi with a free license, don't forget the `--free-license` option or you'll get the following error:
+
+    ERROR: RbVmomi::Fault: RestrictedVersion: Current license or ESXi version prohibits execution of the requested operation
+
+Home page: http://github.com/maintux/knife-esx
+
+## INSTALLATION:
+
+Be sure you are running the latest version Chef. Versions earlier than 0.10.0 don't support plugins:
+
+    gem install chef
+
+This plugin is distributed as a Ruby Gem. To install it, run:
+
+    gem install knife-esx
+
+Depending on your system's configuration, you may need to run this command with root privileges.
+
+## CONFIGURATION:
+
+In order to communicate with the ESX Cloud API you will have to tell Knife about your Username and API Key.  The easiest way to accomplish this is to create some entries in your `knife.rb` file:
+
+    knife[:esx_host] = "Your ESX host address"
+    knife[:esx_username]  = "root"
+    knife[:esx_password]  = "secret"
+
+You also have the option of passing your ESX Host/Username/Password into the individual knife subcommands using the `--esx-host` `--esx-username` and `--esx-password` command options
+
+## COMMAND LINE BASIC OPTIONS
+
+<pre>
+<code>
+--esx-host HOST                           The ESX host to connect to (default: 127.0.0.1)
+--esx-username USERNAME                   The ESX username used to connect to the host (default: root)
+--esx-password PASSWORD                   The ESX user password
+--esx-templates-dir TEMPLATES_DIRECTORY   The folder where the VM template is stored
+--free-license                            If the ESX(i) host has a free license (default: false)
+--insecure                                Use an insecure connection (default: true)
+</code>
+</pre>
+
+For subcommand specific options, refer to the related subcommand
+
+## SUBCOMMANDS:
+
+This plugin provides the following Knife subcommands.  Specific command options can be found by invoking the subcommand with a `--help` flag
+
+### knife esx vm create
+
+Provisions a new virtual machine in the ESX host and then perform a Chef bootstrap (using the SSH protocol).  The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists (provided by the provisioning). It is primarily intended for Chef Client systems that talk to a Chef server.  By default the virtual machine is bootstrapped using the ubuntu10.04-gems template.  This can be overridden using the `-d` or `--template-file` command options.
+
+#### _Command line options_
+
+<pre>
+<code>
+--vm-disk FILE                                            The path to the VMDK disk file
+--vm-name NAME                                            The Virtual Machine name
+--vm-cpus CPUS                                            The Virtual Machine total number of virtual cpus (for the calculation see below) (default: 1)
+--vm-cpu-cores CPU_CORES                                  The number of cores per CPU socket. The number of sockets is calculated as &lt;CPUS&gt;=&lt;SOCKETS&gt;*&lt;CPU_CORES&gt; (default: 1)
+--datastore NAME                                          The Datastore to use for the VM files (default: datastore1)
+--guest-id NAME                                           The VM GuestID (default: otherGuest)
+--vm-memory MEM                                           The VM memory in MB (default: 512)
+-N NAME | --node-name NAME                                The Chef node name for your new node
+--prerelease                                              Install the pre-release chef gems
+--bootstrap-version VERSION                               The version of Chef to install
+-d DISTRO | --distro DISTRO                               Bootstrap a distro using a template (default: ubuntu10.04-gems)
+--template-file TEMPLATE                                  Full path to location of template to use
+--use-template NAME                                       Try to use an existing template instead of importing disk
+-r RUN_LIST | --run-list RUN_LIST                         Comma separated list of roles/recipes to apply
+-j JSON_ATTRIBUTES | --json-attributes JSON_ATTRIBUTES    A JSON string to be added to the first run of chef-client
+-x USERNAME | --ssh-user USERNAME                         The ssh username (default: root)
+-P PASSWORD | --ssh-password PASSWORD                     The ssh password
+-G GATEWAY | --ssh-gateway GATEWAY                        The ssh password
+-i IDENTITY_FILE | --identity-file IDENTITY_FILE          The SSH identity file used for authentication
+--no-host-key-verify                                      Disable host key verification
+--vm-network network[,network..]                          Network where nic is attached to (default: 'VM Network')
+-M mac[,mac..] | --mac-address mac[,mac..]                Mac address list
+--skip-bootstrap                                          Skip bootstrap process (Deploy only mode)
+--async                                                   Deploy the VMs asynchronously (Ignored unless combined with --batch)
+--batch script.yml                                        Use a batch file to deploy multiple VMs
+</code>
+</pre>
+
+### knife esx vm delete
+
+Deletes an existing virtual machine in the currently configured ESX host by the virtual machine name. You can find the instance id by entering 'knife esx vm list'. Please note - this does not delete the associated node and client objects from the Chef server.
+
+#### _Command line options_
+
+    --force-delete YES|NO     Don't confirm the deletion if yes (default: no)
+
+### knife esx vm list
+
+Outputs a list of all virtual machines in the currently configured ESX host.  Please note - this shows all the virtual machines available in the ESX host, some of which may not be currently managed by the Chef server.
+
+### knife esx template list
+
+Outputs a list of all templates in the currently configured ESX host.
+
+### knife esx template delete TEMPLATE_NAME
+
+Deletes a template
+
+#### _Command line options_
+
+    --force-delete YES|NO     Don't confirm the deletion if yes (default: no)
+
+## EXAMPLES
+
+### Provision a new Ubuntu 11.10 VM using --vm-disk to import a local vmdk file.
+
+    knife esx vm create --template-file ~/.chef/bootstrap/ubuntu11.10-gems.erb \
+                        --vm-disk /path-to/ubuntu1110-x64-vmware-tools.vmdk \
+                        --vm-name knife-esx-test-ubuntu \
+                        --datastore datastore1
+                        --esx-host my-test-host \
+                        --esx-password secret
+
+### Provision a new ubuntu 12.04 VM using --use-template to specify a template on the ESXi Host.
+
+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
+
+### Provision a new ubuntu 12.04 VM using --esx-templates-dir to specify a template directory on the ESXi host.
+
+In this example, the template is located at /vmfs/volumes/datastore1/ubuntu12.04-template-x64/ubuntu12.04-template-x64.vmdk.
+
+    knife esx vm create --esx-username root \
+                        --vm-name ubuntu-12.04-vm \
+                        --datastore datastore1 \
+                        --esx-host server1 \
+                        --use-template ubuntu12.04-template-x64.vmdk \
+                        --esx-templates-dir /vmfs/volumes/datastore1/ubuntu12.04-template-x64
+# LICENSE:
+
+Author:: Sergio Rubio, Massimo Maino (<maintux@gmail.com>)
+Copyright:: Copyright (c) 2011 Sergio Rubio, Massimo Maino
+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.

data/features/esx.feature

@@ -1,5 +1,5 @@
 Feature: knife esx
-  
+
   Scenario: Run esx create vm without arguments
     When I run `knife esx vm create`
     Then the output should contain:
@@ -13,56 +13,56 @@ Feature: knife esx
   Scenario: Unknown esx create sub-command
     When I run `knife esx create foobar`
     Then the output should contain "FATAL: Cannot find sub command for:"
-  
+
   Scenario: Invalid VMDK file
     When I run `knife esx vm create --vm-disk /tmp/foo9098jfj`
     Then the output should contain "Invalid VMDK disk file (--vm-disk)"
-  
+
   Scenario: Missing VM name
     When I run `knife esx vm create --vm-disk /tmp/test.vmdk`
     Then the output should contain "ERROR: Invalid Virtual Machine name (--vm-name)"
-  
+
   Scenario: Missing Host option
     When I run `knife esx vm create --vm-disk /tmp/test.vmdk --vm-name knife-esx-test`
     Then the output should contain "ERROR: RuntimeError: host option required"
-  
+
   Scenario: Invalid ESX host
     When I run `knife esx vm create --vm-disk /tmp/m0n0wall-stream.vmdk --vm-name knife-esx-test --esx-host localhost --esx-password temporal --datastore datastore1`
     Then the output should contain "ERROR: Network Error: Connection refused"
-  
+
   Scenario: Invalid ESX password
     When I run `knife esx vm create --vm-disk /tmp/m0n0wall-stream.vmdk --vm-name knife-esx-test --esx-host esx-test-host --esx-password oiusdf`
     Then the output should contain "ERROR: RbVmomi::Fault: InvalidLogin: Cannot complete login due to an incorrect user name or password"
-  
+
   Scenario: Unknown host
     When I run `knife esx vm create --vm-disk /tmp/m0n0wall-stream.vmdk --vm-name knife-esx-test --esx-host lllocalhost --esx-password temporal --datastore datastore1`
     Then the output should contain "ERROR: Network Error: getaddrinfo: Name or service not known"
-  
+
   Scenario: Missing VMWare Tools in server
     When I run `knife esx vm create --vm-disk /tmp/m0n0wall-stream.vmdk --vm-name knife-esx-test --esx-host esx-test-host --esx-password temporal --datastore datastore1`
     Then the output should contain "Timeout trying to reach the VM. Does it have vmware-tools installed?"
-  
+
   Scenario: Existing VM disk in host
     When I run `knife esx vm create --vm-disk /tmp/m0n0wall-stream.vmdk --vm-name knife-esx-test --esx-host esx-test-host --esx-password temporal --datastore datastore1`
     Then the output should contain "ERROR: Exception: Destination file"
-  
-  Scenario: Delete Existing VM 
+
+  Scenario: Delete Existing VM
     When I run `knife esx vm delete --force-delete yes knife-esx-test --esx-host esx-test-host --esx-password temporal`
     Then the output should contain "WARNING: Deleted virtual machine knife-esx-test"
 
-  Scenario: Delete non-existent VM 
+  Scenario: Delete non-existent VM
     When I run `knife esx vm delete --force-delete yes knife-esx-test --esx-host esx-test-host --esx-password temporal`
     Then the output should contain "WARNING: Virtual Machine knife-esx-test not found"
 
   @announce
   Scenario:  Success bootstraping VM
-    When I run `knife esx vm create --template-file /home/rubiojr/.chef/bootstrap/ubuntu11.10-gems.erb --vm-disk /home/rubiojr/tmp/ubuntu1110-x64-vmware-tools.vmdk --vm-name knife-esx-test-ubuntu --esx-host esx-test-host --esx-password temporal --datastore datastore1 --ssh-user ubuntu --ssh-password ubuntu --no-host-key-verify`
+    When I run `knife esx vm create --template-file /home/maintux/.chef/bootstrap/ubuntu11.10-gems.erb --vm-disk /home/maintux/tmp/ubuntu1110-x64-vmware-tools.vmdk --vm-name knife-esx-test-ubuntu --esx-host esx-test-host --esx-password temporal --datastore datastore1 --ssh-user ubuntu --ssh-password ubuntu --no-host-key-verify`
     Then the output should contain "Done!"
 
   Scenario: List virtual machine
     When I run `knife esx vm list --esx-host esx-test-host --esx-password temporal`
     Then the output should contain "knife-esx-test-ubuntu"
 
-  Scenario: Delete Existing VM 
+  Scenario: Delete Existing VM
     When I run `knife esx vm delete --force-delete yes knife-esx-test-ubuntu --esx-host esx-test-host --esx-password temporal`
     Then the output should contain "WARNING: Deleted virtual machine knife-esx-test-ubuntu"

data/knife-esx.gemspec

@@ -7,19 +7,18 @@ Gem::Specification.new do |s|
   s.version     = Knife::ESX::VERSION
   s.has_rdoc = true
   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.email       = ["maintux@gmail.com"]
+  s.homepage = "http://github.com/maintux/knife-esx"
   s.summary = "ESX Support for Chef's Knife Command"
   s.description = s.summary
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
+  s.extra_rdoc_files = ["README.md", "LICENSE" ]
 
   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.2"
+  s.add_dependency "esx", ">= 0.4.4"
   s.add_dependency "terminal-table"
   s.add_dependency "chef", ">= 0.10"
-  s.add_dependency "celluloid", ">= 0.9"
   s.add_dependency "open4"
   s.require_paths = ["lib"]
 

data/lib/chef/knife/esx_base.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Sergio Rubio (<rubiojr@frameos.org>)
-# Copyright:: Sergio Rubio (c) 2011
+# Author:: Sergio Rubio, Massimo Maino (<maintux@gmail.com>)
+# Copyright:: Sergio Rubio, Massimo Maino (c) 2011
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,13 +52,13 @@ 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",

data/lib/chef/knife/esx_template_delete.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Sergio Rubio (<rubiojr@frameos.org>)
-# Copyright:: Copyright (c) 2011 Sergio Rubio
+# Author:: Sergio Rubio, Massimo Maino (<maintux@gmail.com>)
+# Copyright:: Sergio Rubio, Massimo Maino (c) 2011
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/esx_template_import.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Sergio Rubio (<rubiojr@frameos.org>)
-# Copyright:: Copyright (c) 2011 Sergio Rubio
+# Author:: Sergio Rubio, Massimo Maino (<maintux@gmail.com>)
+# Copyright:: Sergio Rubio, Massimo Maino (c) 2011
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/esx_template_list.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Sergio Rubio (<rubiojr@frameos.org>)
-# Copyright:: Copyright (c) 2011 Sergio Rubio
+# Author:: Sergio Rubio, Massimo Maino (<maintux@gmail.com>)
+# Copyright:: Sergio Rubio, Massimo Maino (c) 2011
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/esx_vm_create.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Sergio Rubio (<rubiojr@frameos.org>)
-# Copyright:: Copyright (c) 2011, Sergio Rubio
+# Author:: Sergio Rubio, Massimo Maino (<maintux@gmail.com>)
+# Copyright:: Sergio Rubio, Massimo Maino (c) 2011
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,6 @@
 
 require 'chef/knife/esx_base'
 require 'open4'
-require 'celluloid'
 require 'singleton'
 require 'yaml'
 
@@ -31,18 +30,18 @@ module KnifeESX
     #---
     #:test1:
     #  'vm-memory':
-    #  'extra-args': 
+    #  'extra-args':
     #  'esx-host':
-    #  'template-file': 
-    #  'vm-disk': 
+    #  'template-file':
+    #  'vm-disk':
     #  'ssh-user':
-    #  'ssh-password': 
-    #  'run-list': 
-    #  'network-interface': 
+    #  'ssh-password':
+    #  'run-list':
+    #  'network-interface':
     def initialize(batch_file)
       @batch_file = batch_file
       @jobs = []
-      @job_count = 0 
+      @job_count = 0
       (YAML.load_file batch_file).each do |i|
         @jobs << DeployJob.new(i)
         @job_count += 1
@@ -57,23 +56,8 @@ module KnifeESX
 
   end
 
-  class CLogger
-    include Celluloid
-    include Singleton
-
-    def info(msg)
-      puts "INFO: #{msg}"
-    end
-
-    def error(msg)
-      $stderr.puts "ERROR: #{msg}"
-    end
-  end
-
   class DeployJob
 
-    include Celluloid
-
     attr_reader :name
 
     def initialize(options)
@@ -109,21 +93,21 @@ 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"
-      KnifeESX::CLogger.instance.info! "Bootstrapping VM #{@name} \n#{optstring.join}"
-      KnifeESX::CLogger.instance.info! "VM #{@name} bootstrap log: #{log_file}"
+      Chef::Log.info "Bootstrapping VM #{@name} \n#{optstring.join}"
+      Chef::Log.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
-        KnifeESX::CLogger.instance.info! "[#{@name}] deployment finished OK"
+        Chef::Log.info "[#{@name}] deployment finished OK"
       else
-        KnifeESX::CLogger.instance.error! "[#{@name}] deployment FAILED"
+        Chef::Log.error "[#{@name}] deployment FAILED"
         @err.each_line do |l|
-          KnifeESX::CLogger.instance.error! "[#{@name}] #{l.chomp}"
+          Chef::Log.error "[#{@name}] #{l.chomp}"
         end
       end
-      return @status, @out, @err 
+      return @status, @out, @err
     end
 
   end
@@ -153,17 +137,21 @@ 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 :cpu_cores,
+        :long => "--vm-cpu-cores CPU_CORES",
+        :description => "The Virtual Machine cores per cpu (default: 1)"
+
       option :datastore,
         :long => "--datastore NAME",
         :default => 'datastore1',
         :description => "The Datastore to use for the VM files (default: datastore1)"
-      
+
       option :guest_id,
         :long => "--guest-id NAME",
         :default => "otherGuest",
@@ -205,7 +193,7 @@ class Chef
         :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",
@@ -225,17 +213,22 @@ class Chef
         :long => "--ssh-user USERNAME",
         :description => "The ssh username; default is 'root'",
         :default => "root"
-      
+
       option :ssh_password,
         :short => "-P PASSWORD",
         :long => "--ssh-password PASSWORD",
         :description => "The ssh password"
 
+      option :ssh_gateway,
+        :short => "-G GATEWAY",
+        :long => "--ssh-gateway GATEWAY",
+        :description => "The ssh gateway"
+
       option :identity_file,
         :short => "-i IDENTITY_FILE",
         :long => "--identity-file IDENTITY_FILE",
         :description => "The SSH identity file used for authentication"
-      
+
       option :no_host_key_verify,
         :long => "--no-host-key-verify",
         :description => "Disable host key verification",
@@ -244,8 +237,7 @@ class Chef
         :proc => Proc.new { true }
 
       option :vm_network,
-        :short => "-N network[,network..]",
-        :long => "--vm-network",
+        :long => "--vm-network network[,network..]",
         :description => "Network where nic is attached to",
         :default => 'VM Network'
 
@@ -254,35 +246,40 @@ class Chef
         :long => "--mac-address",
         :description => "Mac address list",
         :default => nil
-      
+
       option :skip_bootstrap,
         :long => "--skip-bootstrap",
         :description => "Skip bootstrap process (Deploy only mode)",
         :boolean => true,
         :default => false,
         :proc => Proc.new { true }
-      
+
       option :async,
         :long => "--async",
         :description => "Deploy the VMs asynchronously (Ignored unless combined with --batch)",
         :boolean => true,
         :default => false,
         :proc => Proc.new { true }
-      
+
       option :batch,
         :long => "--batch script.yml",
         :description => "Use a batch file to deploy multiple VMs",
         :default => nil
-      
+
       def tcp_test_ssh(hostname)
-        tcp_socket = TCPSocket.new(hostname, 22)
-        readable = IO.select([tcp_socket], nil, nil, 5)
-        if readable
-          Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
-          yield
-          true
+        if config[:ssh_gateway]
+          print "\n#{ui.color("Can't test connection through gateway, sleeping 10 seconds... ", :magenta)}"
+          sleep 10
         else
-          false
+          tcp_socket = TCPSocket.new(hostname, 22)
+          readable = IO.select([tcp_socket], nil, nil, 5)
+          if readable
+            Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
+            yield
+            true
+          else
+            false
+          end
         end
       rescue Errno::ETIMEDOUT, Errno::EPERM
         false
@@ -295,27 +292,27 @@ class Chef
 
       def run
         $stdout.sync = true
-        
+
         if config[:batch]
-          KnifeESX::CLogger.instance.info "Running in batch mode. Extra arguments will be ignored."
+          Chef::Log.info "Running in batch mode. Extra arguments will be ignored."
           if not config[:async]
             counter = 0
             script = KnifeESX::DeployScript.new(config[:batch])
             script.each_job do |job|
               counter += 1
               status, stdout, stderr = job.run
-              if status == 0 
-                KnifeESX::CLogger.instance.info 'Ok'
+              if status == 0
+                Chef::Log.info 'Ok'
               else
-                KnifeESX::CLogger.instance.error 'Failed'
+                Chef::Log.error 'Failed'
                 stderr.each_line do |l|
                   ui.error l
                 end
               end
             end
           else
-            KnifeESX::CLogger.instance.info! "Asynchronous boostrapping selected"
-            KnifeESX::CLogger.instance.info! "Now do something productive while I finish my job ;)"
+            Chef::Log.info "Asynchronous boostrapping selected"
+            Chef::Log.info "Now do something productive while I finish my job ;)"
             script = KnifeESX::DeployScript.new(config[:batch])
             futures = []
             script.each_job do |job|
@@ -333,23 +330,24 @@ class Chef
             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]
         if not vm_name
           ui.error("Invalid Virtual Machine name (--vm-name)")
           exit 1
         end
 
-          
+
         datastore = config[:datastore]
         memory = config[:memory]
         cpus = config[:cpus]||1
+        cpu_cores = config[:cpu_cores]||1
         vm_disk = config[:vm_disk]
         guest_id =config[:guest_id]
         destination_path = "/vmfs/volumes/#{datastore}/#{vm_name}"
@@ -375,21 +373,22 @@ class Chef
                              :disk_file => "#{vm_name}/#{vm_name}.vmdk",
                              :memory => memory,
                              :cpus => cpus,
+                             :cpu_cores => cpu_cores,
                              :guest_id => guest_id,
                              :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"
-        
+
         return if config[:skip_bootstrap]
 
         # wait for it to be ready to do stuff
         print "\n#{ui.color("Waiting server... ", :magenta)}"
         timeout = 100
         found = connection.virtual_machines.find { |v| v.name == vm.name }
-        loop do 
+        loop do
           if not vm.ip_address.nil? and not vm.ip_address.empty?
             puts "\n#{ui.color("VM IP Address: #{vm.ip_address}", :cyan)}"
             break
@@ -421,7 +420,7 @@ class Chef
         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[:ssh_user] = config[:ssh_user]
         bootstrap.config[:identity_file] = config[:identity_file]
         bootstrap.config[:chef_node_name] = config[:chef_node_name] || vm.name
         bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
@@ -432,6 +431,7 @@ class Chef
         bootstrap.config[:environment] = config[:environment]
         bootstrap.config[:no_host_key_verify] = config[:no_host_key_verify]
         bootstrap.config[:ssh_password] = config[:ssh_password]
+        bootstrap.config[:ssh_gateway] = config[:ssh_gateway]
         bootstrap
       end
 

data/lib/chef/knife/esx_vm_delete.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Sergio Rubio (<rubiojr@frameos.org>)
-# Copyright:: Copyright (c) 2011 Sergio Rubio
+# Author:: Sergio Rubio, Massimo Maino (<maintux@gmail.com>)
+# Copyright:: Sergio Rubio, Massimo Maino (c) 2011
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/esx_vm_list.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Sergio Rubio (<rubiojr@frameos.org>)
-# Copyright:: Copyright (c) 2011 Sergio Rubio
+# Author:: Sergio Rubio, Massimo Maino (<maintux@gmail.com>)
+# Copyright:: Sergio Rubio, Massimo Maino (c) 2011
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/knife-esx/version.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-esx
 version: !ruby/object:Gem::Version
-  version: 0.3.3
-  prerelease: 
+  version: 0.3.5
 platform: ruby
 authors:
 - Sergio Rubio
@@ -10,102 +9,77 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: esx
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   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:
-- README.rdoc
+- README.md
 - LICENSE
 files:
+- .gitignore
 - CHANGELOG.md
 - LICENSE
-- README.rdoc
+- README.md
 - features/esx.feature
 - features/foo
 - features/step_definitions/steps.rb
@@ -119,32 +93,28 @@ files:
 - lib/chef/knife/esx_vm_delete.rb
 - lib/chef/knife/esx_vm_list.rb
 - lib/knife-esx/version.rb
-homepage: http://github.com/rubiojr/knife-esx
+homepage: http://github.com/maintux/knife-esx
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ESX Support for Chef's Knife Command
-test_files:
-- features/esx.feature
-- features/foo
-- features/step_definitions/steps.rb
-- features/support/env.rb
+test_files: []
+has_rdoc: true

data/README.rdoc

@@ -1,85 +0,0 @@
-= Knife ESX
-
-= DESCRIPTION:
-
-This is the unofficial Opscode Knife plugin for ESX. This plugin gives knife the ability to create, bootstrap, and manage virtual machines in a VMWare ESX/ESXi host.
-
-You'll need an ESX(i)4/5 host with SSH enabled and a privileged user account to connect to it via SSH:
-
-You'll also need a base VM template (a VMDK in fact) with CentOS/Ubuntu/Fedora and vmware-tools installed.
-
-http://github.com/rubiojr/knife-esx
-
-= INSTALLATION:
-
-Be sure you are running the latest version Chef. Versions earlier than 0.10.0 don't support plugins:
-
-    gem install chef
-
-This plugin is distributed as a Ruby Gem. To install it, run:
-
-    gem install knife-esx
-
-Depending on your system's configuration, you may need to run this command with root privileges.
-
-= CONFIGURATION:
-
-In order to communicate with the ESX Cloud API you will have to tell Knife about your Username and API Key.  The easiest way to accomplish this is to create some entries in your <tt>knife.rb</tt> file:
-
-    knife[:esx_host] = "Your ESX host address"
-    knife[:esx_username]  = "root"
-    knife[:esx_password]  = "secret"
-
-You also have the option of passing your ESX Host/Username/Password into the individual knife subcommands using the <tt>--esx-host</tt> <tt>--esx-username</tt> and <tt>--esx-password</tt> command options
-
-    # provision a new Ubuntu 11.10 VM
-    knife esx vm create --template-file ~/.chef/bootstrap/ubuntu11.10-gems.erb \
-                        --vm-disk /path-to/ubuntu1110-x64-vmware-tools.vmdk \
-                        --vm-name knife-esx-test-ubuntu \
-                        --datastore datastore1
-                        --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
-
-== knife esx vm create
-
-Provisions a new virtual machine in the ESX host and then perform a Chef bootstrap (using the SSH protocol).  The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists (provided by the provisioning). It is primarily intended for Chef Client systems that talk to a Chef server.  By default the virtual machine is bootstrapped using the {ubuntu10.04-gems}[https://github.com/opscode/chef/blob/master/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb] template.  This can be overridden using the <tt>-d</tt> or <tt>--template-file</tt> command options.
-
-== knife esx vm delete
-
-Deletes an existing virtual machine in the currently configured ESX host by the virtual machine name. You can find the instance id by entering 'knife esx vm list'. Please note - this does not delete the associated node and client objects from the Chef server.
-
-== knife esx vm list
-
-Outputs a list of all virtual machines in the currently configured ESX host.  Please note - this shows all the virtual machines available in the ESX host, some of which may not be currently managed by the Chef server.
-
-= LICENSE:
-
-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.