vagrant-vcloud 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d401c3fdff9b128ececdc4ee0ffbdf66f6210bc
-  data.tar.gz: 9a07a539ac1f386acb2a838e1c064cc6c64de25d
+  metadata.gz: beb3fb2a8c171a33da931289fe566246e416f1bb
+  data.tar.gz: 2fbee46af8c1f58713c1279356bdf46ef81f05a8
 SHA512:
-  metadata.gz: fa540638ca6eb725d62349b305fe417da030d52ea7e74bb8d9307d01350ac89560e6a241ead5f3ef95dfc1d2d7e28f87d2f2df1adfd30083f7c0810c13df9c42
-  data.tar.gz: 8fa7216cba76bbfc9787bf8aa025f59c6c1f5851362aed47b3c9c6cad1b7a82dbb3142a71e0c98175ede4b7b78c628b741275cf53c3acec5210c97e0fdbd277a
+  metadata.gz: 539d00b06ce68283799b8a41208229649c6067eaa5ad4861e4cd8d4099045133e89fde9c22a71c5f64732e09661eb3471bac2c93f68a4488a52df595b9ec76e6
+  data.tar.gz: 49afaa371cc4fc39b3c198d611790f2b1eadc26346ebfcd6a8330690f55e24bd6cb62b4a0f81816dd640ae12bcc5337c98b6f6a1154ff06790958c211a68d1c0

data/.gitignore

@@ -4,3 +4,6 @@ Gemfile.lock
 test-*
 .yardoc/*
 doc/*
+Vagrantfile
+puppet/*
+*.gem

data/.rubocop.yml

@@ -0,0 +1,34 @@
+MethodLength:
+  CountComments: false  # count full line comments?
+  Enabled: false
+
+MethodName:
+  EnforcedStyle: snake_case
+
+AccessorMethodName:
+  Description: Check the naming of accessor methods for get_/set_.
+  Enabled: false
+
+Encoding:
+  Description: 'Use UTF-8 as the source file encoding.'
+  Enabled: true
+
+HashSyntax:
+  Description: >-
+                 Prefer Ruby 1.9 hash syntax { a: 1, b: 2 } over 1.8 syntax
+                 { :a => 1, :b => 2 }.
+  Enabled: false
+  EnforcedStyle: hash_rockets
+
+LineEndConcatenation:
+  Description: 'Use \\ instead of + to concatenate two string literals at line end.'
+  Enabled: true
+
+LineLength:
+  Description: 'Limit lines to 80 characters.'
+  Enabled: true
+  Max: 80
+
+CyclomaticComplexity:
+  Description: 'Avoid complex methods.'
+  Enabled: false

data/README.md

@@ -1,13 +1,30 @@
 [Vagrant](http://www.vagrantup.com) provider for VMware vCloud Director®
 =============
 
-[Version 0.1.1](https://github.com/frapposelli/vagrant-vcloud/releases/tag/v0.1.1) has been released!
+[Version 0.2.0](https://github.com/frapposelli/vagrant-vcloud/releases/tag/v0.2.0) has been released!
 -------------
 
 Please note that this software is still Alpha/Beta quality and is not recommended for production usage.
 
 Right now a [Precise32](http://vagrant.tsugliani.fr/precise32.box) is available for use, or you can roll your own as you please, make sure to install VMware tools in it.
 
+Features of Version 0.2.0 are:
+
+- It's now possible to connect to an existing VDC network without creating a vShield Edge [ISSUE #23].
+- Added a ```upload_chunksize``` parameter to specify the chunk dimension during box uploads [ISSUE #21].
+- Added support for [vCloud® Hybrid Service™](http://www.vmware.com/products/vcloud-hybrid-service) API version 5.7.
+- Added a new command to vagrant called ```vcloud-status``` that shows the current status of the vCloud instance relative to the Vagrant deployment. *experimental*
+- General code cleanup, code should be more readable and there's a rubocop file for our code conventions.
+- Passwords are now hidden when running in DEBUG mode.
+- Initial support for Vagrant 1.5 (currently not supporting the new "share" features).
+- Lowered Nokogiri requirement to 1.5.5 (you may need to remove a later version if installed).
+- Fixed the Edge Gateway NAT rules creation / deletion.
+- Added debug capabilities down to XML traffic exchanged during the REST calls.
+
+Features of Version 0.1.2 are:
+
+- Fix ssh_key array for the sync_folder [ISSUE #30 thanks @JMG-OICR]
+
 Features of Version 0.1.1 are:
 
   - bugfix multiple sub allocation pools ranges [ISSUE #24]
@@ -101,4 +118,4 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/frapposelli/vagrant-vcloud/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/frapposelli/vagrant-vcloud/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/Rakefile

@@ -14,4 +14,4 @@ Bundler::GemHelper.install_tasks
 
 RSpec::Core::RakeTask.new
 
-task :default => 'spec'
+task :default => 'spec'

data/lib/vagrant-vcloud.rb

@@ -1,24 +1,23 @@
-require "pathname"
-require "vagrant-vcloud/plugin"
+require 'pathname'
+require 'vagrant-vcloud/plugin'
 
 module VagrantPlugins
   module VCloud
-    lib_path = Pathname.new(File.expand_path("../vagrant-vcloud", __FILE__))
-    autoload :Action, lib_path.join("action")
-    autoload :Errors, lib_path.join("errors")
+    lib_path = Pathname.new(File.expand_path('../vagrant-vcloud', __FILE__))
+    autoload :Action, lib_path.join('action')
+    autoload :Errors, lib_path.join('errors')
 
     # This returns the path to the source of this plugin.
     #
     # @return [Pathname]
     def self.source_root
-      @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
+      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
   end
 end
 
 module Vagrant
   class Machine
-  
     attr_reader :vappid
 
     def vappid=(value)
@@ -27,13 +26,13 @@ module Vagrant
       # The file that will store the id if we have one. This allows the
       # ID to persist across Vagrant runs.
 
-      id_file = @data_dir.join("../../../vcloud_vappid")
+      id_file = @data_dir.join('../../../vcloud_vappid')
 
       ### this should be ./.vagrant/vcloud_vappid
 
       if value
         # Write the "id" file with the id given.
-        id_file.open("w+") do |f|
+        id_file.open('w+') do |f|
           f.write(value)
         end
       else
@@ -46,20 +45,19 @@ module Vagrant
 
       # Notify the provider that the ID changed in case it needs to do
       # any accounting from it.
-      #@provider.machine_id_changed
+      # @provider.machine_id_changed
     end
 
     # This returns the vCloud Director vApp ID.
     #
     # @return [vAppId]
     def get_vapp_id
-      vappid_file = @data_dir.join("../../../vcloud_vappid")
+      vappid_file = @data_dir.join('../../../vcloud_vappid')
       if vappid_file.file?
         @vappid = vappid_file.read
       else
         nil
       end
     end
-
   end
-end
+end

data/lib/vagrant-vcloud/action.rb

@@ -1,5 +1,5 @@
-require "pathname"
-require "vagrant/action/builder"
+require 'pathname'
+require 'vagrant/action/builder'
 
 module VagrantPlugins
   module VCloud
@@ -11,9 +11,14 @@ module VagrantPlugins
       # a bootup (i.e. not saved).
       def self.action_boot
         Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
           b.use PowerOn
-          b.use HandleNATPortCollisions
-          b.use ForwardPorts
+          b.use Call, IsCreated do |env, b2|
+            unless env[:bridged_network]
+              b2.use HandleNATPortCollisions
+              b2.use ForwardPorts
+            end
+          end
           b.use Provision
           b.use SyncFolders
         end
@@ -23,7 +28,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
@@ -59,14 +64,15 @@ module VagrantPlugins
 
       def self.action_halt
         Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
           b.use ConnectVCloud
           b.use Call, IsPaused do |env, b2|
-            if env[:result]
-              b2.use Resume
-            end
-            b2.use UnmapPortForwardings
-            b2.use PowerOff
+            b2.use Resume if env[:result]
           end
+          b.use Call, IsBridged do |env, b2|
+            b2.use UnmapPortForwardings unless env[:bridged_network]
+          end
+          b.use PowerOff
         end
       end
 
@@ -99,11 +105,9 @@ module VagrantPlugins
               b2.use ConnectVCloud
               b2.use Call, IsRunning do |env2, b3|
               # If the VM is running, must power off
-                if env2[:result]
-                 b3.use action_halt
-                end
+                b3.use action_halt if env2[:result]
                 b3.use Destroy
-              end 
+              end
             else
               b2.use MessageWillNotDestroy
             end
@@ -115,7 +119,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
@@ -151,12 +155,12 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
             # This calls our helper that announces the IP used to connect
-            # to the VM, either directly to the vApp vShield or to the Org Edge.
+            # to the VM, either directly to the vApp vShield or to the Org Edge
             b2.use AnnounceSSHExec
           end
         end
@@ -166,7 +170,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
@@ -180,13 +184,11 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use HandleBoxUrl
-            end
+            b2.use HandleBox unless env[:result]
           end
           b.use ConnectVCloud
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use InventoryCheck
               b2.use BuildVApp
             end
@@ -197,30 +199,55 @@ module VagrantPlugins
       end
 
       # The autoload farm
-      action_root = Pathname.new(File.expand_path("../action", __FILE__))
-      autoload :AnnounceSSHExec, action_root.join("announce_ssh_exec")
-      autoload :BuildVApp, action_root.join("build_vapp")
-      autoload :ConnectVCloud, action_root.join("connect_vcloud")
-      autoload :Destroy, action_root.join("destroy")
-      autoload :DisconnectVCloud, action_root.join("disconnect_vcloud")
-      autoload :ForwardPorts, action_root.join("forward_ports")
-      autoload :HandleNATPortCollisions, action_root.join("handle_nat_port_collisions")
-      autoload :InventoryCheck, action_root.join("inventory_check")
-      autoload :IsCreated, action_root.join("is_created")
-      autoload :IsPaused, action_root.join("is_paused")
-      autoload :IsRunning, action_root.join("is_running")
-      autoload :MessageAlreadyRunning, action_root.join("message_already_running")
-      autoload :MessageCannotSuspend, action_root.join("message_cannot_suspend")
-      autoload :MessageNotCreated, action_root.join("message_not_created")
-      autoload :MessageWillNotDestroy, action_root.join("message_will_not_destroy")
-      autoload :PowerOff, action_root.join("power_off")
-      autoload :PowerOn, action_root.join("power_on")
-      autoload :ReadSSHInfo, action_root.join("read_ssh_info")
-      autoload :ReadState, action_root.join("read_state")
-      autoload :Resume, action_root.join("resume")
-      autoload :Suspend, action_root.join("suspend")
-      autoload :SyncFolders, action_root.join("sync_folders")
-      autoload :UnmapPortForwardings, action_root.join("unmap_port_forwardings")      
+      action_root = Pathname.new(File.expand_path('../action', __FILE__))
+      autoload :AnnounceSSHExec,
+               action_root.join('announce_ssh_exec')
+      autoload :BuildVApp,
+               action_root.join('build_vapp')
+      autoload :ConnectVCloud,
+               action_root.join('connect_vcloud')
+      autoload :Destroy,
+               action_root.join('destroy')
+      autoload :DisconnectVCloud,
+               action_root.join('disconnect_vcloud')
+      autoload :ForwardPorts,
+               action_root.join('forward_ports')
+      autoload :HandleNATPortCollisions,
+               action_root.join('handle_nat_port_collisions')
+      autoload :InventoryCheck,
+               action_root.join('inventory_check')
+      autoload :IsCreated,
+               action_root.join('is_created')
+      autoload :IsBridged,
+               action_root.join('is_bridged')
+      autoload :IsPaused,
+               action_root.join('is_paused')
+      autoload :IsRunning,
+               action_root.join('is_running')
+      autoload :MessageAlreadyRunning,
+               action_root.join('message_already_running')
+      autoload :MessageCannotSuspend,
+               action_root.join('message_cannot_suspend')
+      autoload :MessageNotCreated,
+               action_root.join('message_not_created')
+      autoload :MessageWillNotDestroy,
+               action_root.join('message_will_not_destroy')
+      autoload :PowerOff,
+               action_root.join('power_off')
+      autoload :PowerOn,
+               action_root.join('power_on')
+      autoload :ReadSSHInfo,
+               action_root.join('read_ssh_info')
+      autoload :ReadState,
+               action_root.join('read_state')
+      autoload :Resume,
+               action_root.join('resume')
+      autoload :Suspend,
+               action_root.join('suspend')
+      autoload :SyncFolders,
+               action_root.join('sync_folders')
+      autoload :UnmapPortForwardings,
+               action_root.join('unmap_port_forwardings')
     end
   end
-end
+end

data/lib/vagrant-vcloud/action/announce_ssh_exec.rb

@@ -7,8 +7,10 @@ module VagrantPlugins
         end
 
         def call(env)
-          sshInfo = env[:machine].ssh_info
-          env[:ui].success("External IP for #{env[:machine].name}: #{sshInfo[:host]}")
+          ssh_info = env[:machine].ssh_info
+          env[:ui].success(
+            "External IP for #{env[:machine].name}: #{ssh_info[:host]}"
+          )
           super
         end
       end

data/lib/vagrant-vcloud/action/build_vapp.rb

@@ -1,6 +1,6 @@
-require "securerandom"
-require "etc"
-require "netaddr"
+require 'securerandom'
+require 'etc'
+require 'netaddr'
 
 module VagrantPlugins
   module VCloud
@@ -8,28 +8,26 @@ module VagrantPlugins
       class BuildVApp
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant_vcloud::action::build_vapp")
+          @logger = Log4r::Logger.new('vagrant_vcloud::action::build_vapp')
         end
 
         def call(env)
-
-          # FIXME: we need to find a way to clean things up when a SIGINT get 
+          # FIXME: we need to find a way to clean things up when a SIGINT get
           # called... see env[:interrupted] in the vagrant code
 
           cfg = env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
-          vmName = env[:machine].name
+          vm_name = env[:machine].name
 
           if cfg.ip_dns.nil?
-            dnsAddress1 = "8.8.8.8"
-            dnsAddress2 = "8.8.4.4"
+            dns_address1 = '8.8.8.8'
+            dns_address2 = '8.8.4.4'
           else
-            dnsAddress1 = cfg.ip_dns.shift
-            dnsAddress2 = cfg.ip_dns.shift
+            dns_address1 = cfg.ip_dns.shift
+            dns_address2 = cfg.ip_dns.shift
           end
 
           if !cfg.ip_subnet.nil?
-
             @logger.debug("Input address: #{cfg.ip_subnet}")
 
             begin
@@ -37,159 +35,185 @@ module VagrantPlugins
             rescue NetAddr::ValidationError
               raise Errors::InvalidSubnet, :message => cfg.ip_subnet
             end
-              if cidr.bits > 30
-                @logger.debug("Subnet too small!")
-                raise Errors::SubnetTooSmall, :message => cfg.ip_subnet
-              end
 
-            rangeAddresses = cidr.range(0)
+            if cidr.bits > 30
+              @logger.debug('Subnet too small!')
+              raise Errors::SubnetTooSmall, :message => cfg.ip_subnet
+            end
+
+            range_addresses = cidr.range(0)
 
-            @logger.debug("Range: #{rangeAddresses}")
+            @logger.debug("Range: #{range_addresses}")
 
-            rangeAddresses.shift              # Delete the "network" address from the range.
-            gatewayIp = rangeAddresses.shift  # Retrieve the first usable IP, to be used as a gateway.
-            rangeAddresses.reverse!           # Reverse the array in place.
-            rangeAddresses.shift              # Delete the "broadcast" address from the range.
-            rangeAddresses.reverse!           # Reverse back the array.
+            # Delete the "network" address from the range.
+            range_addresses.shift
+            # Retrieve the first usable IP, to be used as a gateway.
+            gateway_ip = range_addresses.shift
+            # Reverse the array in place.
+            range_addresses.reverse!
+            # Delete the "broadcast" address from the range.
+            range_addresses.shift
+            # Reverse back the array.
+            range_addresses.reverse!
 
-            @logger.debug("Gateway IP: #{gatewayIp.to_s}")
+            @logger.debug("Gateway IP: #{gateway_ip.to_s}")
             @logger.debug("Netmask: #{cidr.wildcard_mask}")
-            @logger.debug("IP Pool: #{rangeAddresses.first}-#{rangeAddresses.last}")
-            @logger.debug("DNS1: #{dnsAddress1} DNS2: #{dnsAddress2}")
-
-
-            network_options = { 
-              :name => "Vagrant-vApp-Net", 
-              :gateway => gatewayIp.to_s, 
-              :netmask => cidr.wildcard_mask, 
-              :start_address => rangeAddresses.first, 
-              :end_address => rangeAddresses.last, 
-              :fence_mode => "natRouted",
-              :ip_allocation_mode => "POOL",
-              :parent_network =>  cfg.vdc_network_id,
-              :enable_firewall => "false",
-              :dns1 => dnsAddress1,
-              :dns2 => dnsAddress2
+            @logger.debug(
+              "IP Pool: #{range_addresses.first}-#{range_addresses.last}"
+            )
+            @logger.debug("DNS1: #{dns_address1} DNS2: #{dns_address2}")
+
+            network_options = {
+              :name               => 'Vagrant-vApp-Net',
+              :gateway            => gateway_ip.to_s,
+              :netmask            => cidr.wildcard_mask,
+              :start_address      => range_addresses.first,
+              :end_address        => range_addresses.last,
+              :fence_mode         => 'natRouted',
+              :ip_allocation_mode => 'POOL',
+              :parent_network     => cfg.vdc_network_id,
+              :enable_firewall    => 'false',
+              :dns1               => dns_address1,
+              :dns2               => dns_address2
             }
 
+          elsif !cfg.network_bridge.nil?
+            # Bridged mode, avoid deploying a vShield Edge altogether.
+            network_options = {
+              :name               => 'Vagrant-vApp-Net',
+              :fence_mode         => 'bridged',
+              :ip_allocation_mode => 'POOL',
+              :parent_network     => cfg.vdc_network_id
+            }
+
+            env[:bridged_network] = true
+
           else
 
-            @logger.debug("DNS1: #{dnsAddress1} DNS2: #{dnsAddress2}")
+            @logger.debug("DNS1: #{dns_address1} DNS2: #{dns_address2}")
             # No IP subnet specified, reverting to defaults
-            network_options = { 
-              :name => "Vagrant-vApp-Net", 
-              :gateway => "10.1.1.1", 
-              :netmask => "255.255.255.0", 
-              :start_address => "10.1.1.2", 
-              :end_address => "10.1.1.254", 
-              :fence_mode => "natRouted",
-              :ip_allocation_mode => "POOL",
-              :parent_network =>  cfg.vdc_network_id,
-              :enable_firewall => "false",
-              :dns1 => dnsAddress1,
-              :dns2 => dnsAddress2
+            network_options = {
+              :name               => 'Vagrant-vApp-Net',
+              :gateway            => '10.1.1.1',
+              :netmask            => '255.255.255.0',
+              :start_address      => '10.1.1.2',
+              :end_address        => '10.1.1.254',
+              :fence_mode         => 'natRouted',
+              :ip_allocation_mode => 'POOL',
+              :parent_network     => cfg.vdc_network_id,
+              :enable_firewall    => 'false',
+              :dns1               => dns_address1,
+              :dns2               => dns_address2
             }
 
           end
 
           if env[:machine].get_vapp_id.nil?
-
-            env[:ui].info("Building vApp...")
+            env[:ui].info('Building vApp...')
 
             compose = cnx.compose_vapp_from_vm(
-              cfg.vdc_id, 
-              "Vagrant-#{Etc.getlogin}-#{Socket.gethostname.downcase}-#{SecureRandom.hex(4)}",
-              "vApp created by #{Etc.getlogin} running on #{Socket.gethostname.downcase} using vagrant-vcloud on #{Time.now.strftime("%B %d, %Y")}",
-              { 
-                vmName => cfg.catalog_item[:vms_hash][env[:machine].box.name.to_s][:id]
-              }, 
+              cfg.vdc_id,
+              "Vagrant-#{Etc.getlogin}-#{Socket.gethostname.downcase}-" +
+              "#{SecureRandom.hex(4)}",
+              "vApp created by #{Etc.getlogin} running on " +
+              "#{Socket.gethostname.downcase} using vagrant-vcloud on " +
+              "#{Time.now.strftime("%B %d, %Y")}",
+              {
+                vm_name => cfg.catalog_item[:vms_hash][env[:machine].box.name.to_s][:id]
+              },
               network_options
             )
-            @logger.debug("Launched Compose vApp")
+            @logger.debug('Launch Compose vApp...')
             # Wait for the task to finish.
             wait = cnx.wait_task_completion(compose[:task_id])
 
-            if !wait[:errormsg].nil?
-              raise Errors::ComposeVAppError, :message => wait[:errormsg]
+            unless wait[:errormsg].nil?
+              fail Errors::ComposeVAppError, :message => wait[:errormsg]
             end
 
-
             # Fetch thenewly created vApp ID
-            vAppId = compose[:vapp_id]
+            vapp_id = compose[:vapp_id]
 
             # putting the vApp Id in a globally reachable var and file.
-            env[:machine].vappid = vAppId
+            env[:machine].vappid = vapp_id
 
             # Fetching new vApp object to check stuff.
-            newVApp = cnx.get_vapp(vAppId)            
+            new_vapp = cnx.get_vapp(vapp_id)
 
             # FIXME: Add a lot of error handling for each step here !
-
-            if newVApp
-              env[:ui].success("vApp #{newVApp[:name]} successfully created.")
+            if new_vapp
+              env[:ui].success("vApp #{new_vapp[:name]} successfully created.")
 
               # Add the vm id as machine.id
-              newVMProperties = newVApp[:vms_hash].fetch(vmName)
-              env[:machine].id = newVMProperties[:id]
+              new_vm_properties = new_vapp[:vms_hash].fetch(vm_name)
+              env[:machine].id = new_vm_properties[:id]
 
               ### SET GUEST CONFIG
-
-              @logger.info("Setting Guest Customization on ID: [#{vmName}] of vApp [#{newVApp[:name]}]")
-
-              setCustom = cnx.set_vm_guest_customization(newVMProperties[:id], vmName, {
-                :enabled => true,
-                :admin_passwd_enabled => false
-                })
-              cnx.wait_task_completion(setCustom)
+              @logger.info(
+                "Setting Guest Customization on ID: [#{vm_name}] " +
+                "of vApp [#{new_vapp[:name]}]"
+              )
+
+              set_custom = cnx.set_vm_guest_customization(
+                new_vm_properties[:id],
+                vm_name,
+                {
+                  :enabled              => true,
+                  :admin_passwd_enabled => false
+                }
+              )
+              cnx.wait_task_completion(set_custom)
 
             else
-              env[:ui].error("vApp #{newVApp[:name]} creation failed!")
+              env[:ui].error("vApp #{new_vapp[:name]} creation failed!")
               raise # FIXME: error handling missing.
-           end 
+            end
+
           else
-            env[:ui].info("Adding VM to existing vApp...")
-            
+            env[:ui].info('Adding VM to existing vApp...')
+
             recompose = cnx.recompose_vapp_from_vm(
-              env[:machine].get_vapp_id, 
-              { 
-                vmName => cfg.catalog_item[:vms_hash][env[:machine].box.name.to_s][:id]
-              }, 
+              env[:machine].get_vapp_id,
+              {
+                vm_name => cfg.catalog_item[:vms_hash][env[:machine].box.name.to_s][:id]
+              },
               network_options
             )
 
-            @logger.info("Waiting for the add to complete ...")
+            @logger.info('Waiting for the recompose task to complete ...')
 
             # Wait for the task to finish.
-            wait = cnx.wait_task_completion(recompose[:task_id])
-
-            newVApp = cnx.get_vapp(env[:machine].get_vapp_id)
+            cnx.wait_task_completion(recompose[:task_id])
 
+            new_vapp = cnx.get_vapp(env[:machine].get_vapp_id)
             # FIXME: Add a lot of error handling for each step here !
-
-            if newVApp
-
-              newVMProperties = newVApp[:vms_hash].fetch(vmName)
-              env[:machine].id = newVMProperties[:id]
+            if new_vapp
+              new_vm_properties = new_vapp[:vms_hash].fetch(vm_name)
+              env[:machine].id = new_vm_properties[:id]
 
               ### SET GUEST CONFIG
-              
-              @logger.info("Setting Guest Customization on ID: [#{newVMProperties[:id]}] of vApp [#{newVApp[:name]}]")
-              
-              setCustom = cnx.set_vm_guest_customization(newVMProperties[:id], vmName, {
-                :enabled => true,
-                :admin_passwd_enabled => false
-                })
-              cnx.wait_task_completion(setCustom)
+              @logger.info(
+                'Setting Guest Customization on ID: ' +
+                "[#{new_vm_properties[:id]}] of vApp [#{new_vapp[:name]}]"
+              )
+
+              set_custom = cnx.set_vm_guest_customization(
+                new_vm_properties[:id],
+                vm_name,
+                {
+                  :enabled              => true,
+                  :admin_passwd_enabled => false
+                }
+              )
+              cnx.wait_task_completion(set_custom)
 
             else
-
-              env[:ui].error("VM #{vmName} add to #{newVApp[:name]} failed!")
+              env[:ui].error("VM #{vm_name} add to #{new_vapp[:name]} failed!")
               raise
-            end 
+            end
           end
 
           @app.call env
-
         end
       end
     end