vagrant-vcloud 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c063c6be550a2cc4edc377537aa3131e5151b7be
-  data.tar.gz: 6dc78ac5e15f8a82dd04cc096e309fa82f20665e
+  metadata.gz: b9c4c78e1a1282b1aac96e39cfcea24b36847340
+  data.tar.gz: afc6fc6fa406254848db0d871b5f014b0d72f193
 SHA512:
-  metadata.gz: fa89f867841f3aa6c3db196be9ba3731bef0387958c5c1de89f6bfc0dcb3bd657d351199deb70a7ed2ed93a1ab828d2b3bc5f36428767d2c327c7e704cb20f6a
-  data.tar.gz: 045e357b328c4ec61015865353009d2fec8fc4cc4b1f54b489fe9fc402510a0d2a64d1bc8af5973d93f94ccc94f57aa840d91785f7f9981750b14e31241055a2
+  metadata.gz: 6d53ac5b55cd8060e0d73c5168d56ca21793cadcef767bdf0abde2ecd25091eec362a0d6eec4500cbff64e0d16ea77391ba9d5e8759c139a708502b86633bb92
+  data.tar.gz: 29fb9185c93f55efdcd1bf787dc3c67e898231370477e0fed5969509598305d1c289186f77de60e24dc808dfd8902464ad868bf536a3a0be946cf96567043bed

data/README.md

@@ -1,44 +1,84 @@
-[Vagrant](http://www.vagrantup.com) provider for VMware vCloud Director® [![Gem Version](https://badge.fury.io/rb/vagrant-vcloud.svg)](http://badge.fury.io/rb/vagrant-vcloud) [![Code Climate](https://codeclimate.com/github/frapposelli/vagrant-vcloud/badges/gpa.svg)](https://codeclimate.com/github/frapposelli/vagrant-vcloud)
-=============
+[Vagrant](http://www.vagrantup.com) provider for VMware vCloud Director® [![Gem Version](https://badge.fury.io/rb/vagrant-vcloud.svg)](http://badge.fury.io/rb/vagrant-vcloud) [![Code Climate](https://codeclimate.com/github/frapposelli/vagrant-vcloud/badges/gpa.svg)](https://codeclimate.com/github/frapposelli/vagrant-vcloud) [![Dependency Status](https://gemnasium.com/frapposelli/vagrant-vcloud.svg)](https://gemnasium.com/frapposelli/vagrant-vcloud) [![Join the chat at https://gitter.im/frapposelli/vagrant-vcloud](https://badges.gitter.im/frapposelli/vagrant-vcloud.svg)](https://gitter.im/frapposelli/vagrant-vcloud?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+========================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================
 
 Please note that this software is still Alpha/Beta quality and is not recommended for production usage.
 
 We have a wide array of boxes available at [Vagrant Cloud](https://vagrantcloud.com/gosddc) you can use them directly or you can roll your own as you please, make sure to install VMware tools in it.
 
-Starting from [version 0.4.2](../../releases/tag/v0.4.2), this plugin supports the universal [```vmware_ovf``` box format](https://github.com/gosddc/packer-post-processor-vagrant-vmware-ovf/wiki/vmware_ovf-Box-Format), that is 100% portable between [vagrant-vcloud](https://github.com/frapposelli/vagrant-vcloud), [vagrant-vcenter](https://github.com/gosddc/vagrant-vcenter) and [vagrant-vcloudair](https://github.com/gosddc/vagrant-vcloudair), no more double boxes!.
+Starting from [version 0.4.2](../../releases/tag/v0.4.2), this plugin supports the universal [`vmware_ovf` box format](https://github.com/gosddc/packer-post-processor-vagrant-vmware-ovf/wiki/vmware_ovf-Box-Format), that is 100% portable between [vagrant-vcloud](https://github.com/frapposelli/vagrant-vcloud), [vagrant-vcenter](https://github.com/gosddc/vagrant-vcenter) and [vagrant-vcloudair](https://github.com/gosddc/vagrant-vcloudair), no more double boxes!.
 
 If you're unsure about what are the correct network settings for your Vagrantfile make sure to check out the [Network Deployment Options](https://github.com/frapposelli/vagrant-vcloud/wiki/Network-Deployment-Options) wiki page.
 
 Check the full releases changelog [here](../../releases)
 
 Install
--------------
+-------
 
-Latest version can be easily installed by running the following command:
+Latest version can be installed by running the following command:
 
-```vagrant plugin install vagrant-vcloud```
+`vagrant plugin install vagrant-vcloud`
 
 Vagrant will download all the required gems during the installation process.
 
-After the install has completed a ```vagrant up --provider=vcloud``` will trigger the newly installed provider.
+After the install has completed a `vagrant up --provider=vcloud` will trigger the newly installed provider.
 
 Upgrade
--------------
+-------
 
 If you already have vagrant-vcloud installed you can update to the latest version available by issuing:
 
-```vagrant plugin update vagrant-vcloud```
+`vagrant plugin update vagrant-vcloud`
 
 Vagrant will take care of the upgrade process.
 
 Configuration
 -------------
 
-Here's a sample Multi-VM Vagrantfile, please note that ```vcloud.vdc_edge_gateway``` and ```vcloud.vdc_edge_gateway_ip``` are required only when you cannot access ```vcloud.vdc_network_name``` directly and there's an Organization Edge between your workstation and the vCloud Network.
+Here's a sample Multi-VM Vagrantfile, please note that `vcloud.vdc_edge_gateway` and `vcloud.vdc_edge_gateway_ip` are required when you cannot access `vcloud.vdc_network_name` directly and there's an Organization Edge between your workstation and the vCloud Network.
 
 ```ruby
+vapp = {
+  name: 'My vApp name',
+  org_name: 'OrganizationName',
+  orgvdc_name: 'vDC_Name',
+  orgvdccatalog_name: 'Vagrant',
+  metadata: [ [ 'key', 'value' ] ],
+  advanced_networking: true,
+  networks: {
+    org: [ 'Org_VDC_Network' ],
+    vapp: [
+      {
+        name: 'MyNetwork',
+        ip_subnet: '10.10.10.10/255.255.255.0'
+      }
+    ]
+  }
+}
+
 nodes = [
-  { hostname: 'web-vm', box: 'gosddc/precise32' },
+  {
+    hostname: 'web-vm',
+    box: 'gosddc/precise32',
+    memory: 512,
+    cpus: 1,
+    nested_hypervisor: false,
+    add_hdds: [ 1024 ],
+    power_on: true,
+    ssh_enable: true,
+    sync_enable: true,
+    metadata: [ [ 'key', 'value' ] ],
+    nics: [
+      type: :vmxnet3,
+      connected: true,
+      network: "vApp netowrk",
+      primary: true,
+      ip_mode: "static",
+      ip: "10.10.10.1",
+      mac: "00:50:56:00:00:01"
+    ],
+    enable_guest_customization: true,
+    guest_customization_script: 'touch /sample.file'
+  },
   { hostname: 'ssh-vm', box: 'gosddc/precise32' },
   { hostname: 'sql-vm', box: 'gosddc/precise32' },
   { hostname: 'app-vm', box: 'gosddc/precise32' }
@@ -48,22 +88,30 @@ Vagrant.configure('2') do |config|
 
   # vCloud Director provider settings
   config.vm.provider :vcloud do |vcloud|
-    vcloud.vapp_prefix = 'multibox-sample'
 
     vcloud.hostname = 'https://my.cloudprovider.com'
     vcloud.username = 'MyUserName'
     vcloud.password = 'MySup3rS3cr3tPassw0rd!'
 
-    vcloud.org_name = 'OrganizationName'
-    vcloud.vdc_name = 'vDC_Name'
-
-    vcloud.catalog_name = 'Vagrant'
-    vcloud.ip_subnet = '172.16.32.125/255.255.255.240'
-
-    vcloud.vdc_network_name = 'MyNetwork'
+    vcloud.vapp_prefix = 'multibox-sample'
 
-    vcloud.vdc_edge_gateway = 'MyOrgEdgeGateway'
-    vcloud.vdc_edge_gateway_ip = '10.10.10.10'
+    vcloud.org_name = vapp[:org_name]
+    vcloud.vdc_name = vapp[:orgvdc_name]
+    vcloud.catalog_name = vapp[:orgvdccatalog_name]
+
+    vcloud.vapp_name = vapp[:name]
+    vcloud.metadata_vapp = vapp[:metadata]
+    vcloud.auto_yes_for_upload = vapp[:auto_yes_for_upload]
+
+    vcloud.advanced_network = vapp[:advanced_networking]
+    if vapp[:advanced_networking]
+      vcloud.networks = vapp[:networks]
+    else
+      vcloud.ip_subnet = '172.16.32.125/255.255.255.240'
+      vcloud.vdc_network_name = 'MyNetwork'
+      vcloud.vdc_edge_gateway = 'MyOrgEdgeGateway'
+      vcloud.vdc_edge_gateway_ip = '10.10.10.10'
+      end
   end
 
   nodes.each do |node|
@@ -71,10 +119,27 @@ Vagrant.configure('2') do |config|
       node_config.vm.box = node[:box]
       node_config.vm.hostname = node[:hostname]
       node_config.vm.box_url = node[:box_url]
-      node_config.vm.network :forwarded_port,
-                             guest: 80,
-                             host: 8080,
-                             auto_correct: true
+      if vapp[:advanced_networking]
+        node_config.vm.provider :vcloud do |pro|
+          pro.memory = node[:memory]
+          pro.cpus = node[:cpus]
+          pro.add_hdds = node[:add_hdds]
+          pro.nics = node[:nics]
+          pro.ssh_enabled = node[:ssh_enabled]
+          pro.sync_enabled = node[:sync_enabled]
+          pro.power_on = node[:power_on]
+          pro.metadata_vm = node[:metadata]
+          pro.nested_hypervisor = node[:nested_hypervisor]
+          pro.enable_guest_customization = node[:enable_guest_customization]
+          pro.guest_customization_script = node[:guest_customization_script]
+        end
+        node_config.vm.network :public_network
+      else
+        node_config.vm.network :forwarded_port,
+                               guest: 80,
+                               host: 8080,
+                               auto_correct: true
+      end
       # node_config.vm.provision :puppet do |puppet|
       #   puppet.manifests_path = 'puppet/manifests'
       #   puppet.manifest_file = 'site.pp'
@@ -85,22 +150,19 @@ Vagrant.configure('2') do |config|
 end
 ```
 
-For additional documentation on different network setups with vCloud Director, check the [Network Deployment Options](../../wiki/Network-Deployment-Options) Wiki page
+For additional documentation on network setups with vCloud Director, check the [Network Deployment Options](../../wiki/Network-Deployment-Options) Wiki page
 
 Contribute
--------------
+----------
 
 What is still missing:
 
-- TEST SUITES! (working on that).
-- Speed, the code is definitely not optimized.
-- Permission checks, make sure you have at least Catalog Admin privileges if you want to upload boxes to vCloud.
-- Thorough testing.
-- Error checking is absymal.
-- Some spaghetti code here and there.
-- Bugs, bugs and BUGS!.
-
-If you're a developer and want to lend us a hand, head over to our ```develop``` branch and send us PRs!
-
+-	TEST SUITES! (working on that).
+-	Speed, the code is definitely not optimized.
+-	Permission checks, make sure you have at least Catalog Admin privileges if you want to upload boxes to vCloud.
+-	Thorough testing.
+-	Error checking is absymal.
+-	Some spaghetti code here and there.
+-	Bugs, bugs and BUGS!.
 
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/frapposelli/vagrant-vcloud/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+If you're a developer and want to lend us a hand, head over to our `develop` branch and send us PRs!

data/Rakefile

@@ -11,7 +11,3 @@ $stderr.sync = true
 Dir.chdir(File.expand_path('../', __FILE__))
 
 Bundler::GemHelper.install_tasks
-
-RSpec::Core::RakeTask.new
-
-task :default => 'spec'

data/lib/vagrant-vcloud/action.rb

@@ -20,10 +20,21 @@ module VagrantPlugins
               b2.use HandleNATPortCollisions
               b2.use ForwardPorts
             end
+            cfg = env[:machine].provider_config
+            if cfg.power_on.nil? || cfg.power_on == true
+              if cfg.ssh_enabled.nil? || cfg.ssh_enabled == true
+                b2.use WaitForCommunicator, [:starting, :running]
+              end
+            end
+            b2.use Provision
+            if cfg.power_on.nil? || cfg.power_on == true # can't ssh if not on
+              if cfg.ssh_enabled.nil? || cfg.ssh_enabled == true  # can't sync if ssh is disabled
+                if cfg.sync_enabled.nil? || cfg.sync_enabled == true
+                  b2.use SyncFolders
+                end
+              end
+            end
           end
-          b.use WaitForCommunicator, [:starting, :running]
-          b.use Provision
-          b.use SyncFolders
         end
       end
 
@@ -59,7 +70,7 @@ module VagrantPlugins
         end
       end
 
-      def self.action_halt
+      def self.action_poweroff
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectVCloud
@@ -70,6 +81,17 @@ module VagrantPlugins
         end
       end
 
+      def self.action_halt
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectVCloud
+          b.use Call, IsPaused do |env, b2|
+            b2.use Resume if env[:result]
+          end
+          b.use ShutDown
+        end
+      end
+
       def self.action_suspend
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConnectVCloud
@@ -105,15 +127,15 @@ module VagrantPlugins
 
                 b3.use Call, IsRunning do |env3, b4|
                 # If the VM is running, must power off
-                  b4.use action_halt if env3[:result]
+                  b4.use action_poweroff if env3[:result]
                 end
                 b3.use Call, IsLastVM do |env3, b4|
                   if env3[:result]
                     # Check if the network is bridged
-                    b4.use Call, IsBridged do |env4, b5|
-                      # if it's not, delete port forwardings.
-                      b5.use UnmapPortForwardings unless env4[:bridged_network]
-                    end
+                    # b4.use Call, IsBridged do |env4, b5|
+                    #   # if it's not, delete port forwardings.
+                    #   b5.use UnmapPortForwardings unless env4[:bridged_network] || env4[:advanced_network]
+                    # end
                     b4.use PowerOffVApp
                     b4.use DestroyVApp
                   else
@@ -286,6 +308,8 @@ module VagrantPlugins
                action_root.join('read_state')
       autoload :Resume,
                action_root.join('resume')
+      autoload :ShutDown,
+               action_root.join('shut_down')
       autoload :Suspend,
                action_root.join('suspend')
       autoload :SyncFolders,

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

@@ -19,15 +19,14 @@ module VagrantPlugins
           cnx = cfg.vcloud_cnx.driver
           vm_name = cfg.name ? cfg.name.to_sym : env[:machine].name
 
-          if cfg.ip_dns.nil?
-            dns_address1 = '8.8.8.8'
-            dns_address2 = '8.8.4.4'
-          else
-            dns_address1 = cfg.ip_dns.shift
-            dns_address2 = cfg.ip_dns.shift
-          end
-
           if !cfg.ip_subnet.nil?
+            if cfg.ip_dns.nil?
+              dns_address1 = '8.8.8.8'
+              dns_address2 = '8.8.4.4'
+            else
+              dns_address1 = cfg.ip_dns.shift
+              dns_address2 = cfg.ip_dns.shift
+            end
             @logger.debug("Input address: #{cfg.ip_subnet}")
 
             begin
@@ -56,6 +55,14 @@ module VagrantPlugins
             # Reverse back the array.
             range_addresses.reverse!
 
+            dhcp_enabled = 'false'
+            if !cfg.dhcp_enabled.nil? and cfg.dhcp_enabled == true
+              dhcp_enabled = 'true'
+              range_addresses = cfg.pool_range
+              dhcp_start = cfg.dhcp_range.shift
+              dhcp_end = cfg.dhcp_range.shift
+            end
+
             @logger.debug("Gateway IP: #{gateway_ip.to_s}")
             @logger.debug("Netmask: #{cidr.wildcard_mask}")
             @logger.debug(
@@ -73,6 +80,9 @@ module VagrantPlugins
               :ip_allocation_mode => 'POOL',
               :parent_network     => cfg.vdc_network_id,
               :enable_firewall    => 'false',
+              :dhcp_enabled       => dhcp_enabled,
+              :dhcp_start         => dhcp_start,
+              :dhcp_end           => dhcp_end,
               :dns1               => dns_address1,
               :dns2               => dns_address2
             }
@@ -88,7 +98,127 @@ module VagrantPlugins
 
             env[:bridged_network] = true
 
+          elsif !cfg.networks.nil?
+            # Advanced network definition
+            env[:advanced_network] = true
+            network_options = []
+            if cfg.networks[:org]
+              cfg.networks[:org].each do |net|
+                net_id = cfg.org[:networks][net]
+                if !net_id
+                  # TEMP FIX: permissions issues at the Org Level for vApp authors
+                  #           to "view" Org vDC Networks but they can see them at the
+                  #           Organization vDC level (tsugliani)
+                  net_id = cfg.vdc[:networks][net]
+                  if !net_id
+                    raise 'vCloud User credentials has insufficient privileges'
+                  end
+                end
+                network_options.push({
+                  :name               => net,
+                  :fence_mode         => 'bridged',
+                  :ip_allocation_mode => 'POOL',
+                  :parent_network     => net_id
+                })
+              end
+            end
+            if cfg.networks[:vapp]
+              cfg.networks[:vapp].each_with_index do |net, i|
+                if net[:ip_dns].nil?
+                  dns_address1 = '8.8.8.8'
+                  dns_address2 = '8.8.4.4'
+                else
+                  dns_address1 = net[:ip_dns].shift
+                  dns_address2 = net[:ip_dns].shift
+                end
+                @logger.debug("Input address[#{i}]: #{net[:ip_subnet]}")
+
+                begin
+                  cidr = NetAddr::CIDR.create(net[:ip_subnet])
+                rescue NetAddr::ValidationError
+                  raise Errors::InvalidSubnet, :message => net[:ip_subnet]
+                end
+
+                if cidr.bits > 30
+                  @logger.debug('Subnet too small!')
+                  raise Errors::SubnetTooSmall, :message => net[:ip_subnet]
+                end
+
+                range_addresses = cidr.range(0)
+
+                @logger.debug("Range[#{i}]: #{range_addresses}")
+
+                # Delete the "network" address from the range.
+                range_addresses.shift
+                # Retrieve the first usable IP, to be used as a gateway.
+                if net[:gateway]
+                  gateway_ip = net[:gateway]
+                else
+                  gateway_ip = range_addresses.shift
+                end
+                # 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!
+
+                dhcp_enabled = 'false'
+                dhcp_start = nil
+                dhcp_end = nil
+                if !net[:dhcp_enabled].nil? and net[:dhcp_enabled] == true
+                  dhcp_enabled = 'true'
+                  range_addresses = net[:pool_range]
+                  dhcp_start = net[:dhcp_range].shift
+                  dhcp_end = net[:dhcp_range].shift
+                end
+
+                @logger.debug("Gateway IP[#{i}]: #{gateway_ip.to_s}")
+                @logger.debug("Netmask[#{i}]: #{cidr.wildcard_mask}")
+                @logger.debug("IP Pool[#{i}]: #{range_addresses.first}-#{range_addresses.last}")
+                @logger.debug("DNS1[#{i}]: #{dns_address1} DNS2[#{i}]: #{dns_address2}")
+                n =  {
+                  :name               => net[:name],
+                  :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',
+                  :enable_firewall    => 'false',
+                  :dhcp_enabled       => dhcp_enabled,
+                  :dhcp_start         => dhcp_start,
+                  :dhcp_end           => dhcp_end,
+                  :dns1               => dns_address1,
+                  :dns2               => dns_address2
+                }
+                if net[:vdc_network_name]
+                  net_id = cfg.org[:networks][net[:vdc_network_name]]
+                  if !net_id
+                    # TEMP FIX: permissions issues at the Org Level for vApp authors
+                    #           to "view" Org vDC Networks but they can see them at the
+                    #           Organization vDC level (tsugliani)
+                    net_id = cfg.vdc[:networks][net[:vdc_network_name]]
+                    if !net_id
+                      raise 'vCloud User credentials has insufficient privileges'
+                    end
+                  end
+                  n[:parent_network] = net_id
+                  net[:parent_network] = net_id
+                end
+
+                network_options.push(n)
+              end
+            end
+
           else
+            if cfg.ip_dns.nil?
+              dns_address1 = '8.8.8.8'
+              dns_address2 = '8.8.4.4'
+            else
+              dns_address1 = cfg.ip_dns.shift
+              dns_address2 = cfg.ip_dns.shift
+            end
 
             @logger.debug("DNS1: #{dns_address1} DNS2: #{dns_address2}")
             # No IP subnet specified, reverting to defaults
@@ -108,23 +238,31 @@ module VagrantPlugins
 
           end
 
+          network_options = [network_options] if !network_options.kind_of?(Array)
+
           if env[:machine].get_vapp_id.nil?
             env[:ui].info('Building vApp...')
 
-            vapp_prefix = cfg.vapp_prefix
-            vapp_prefix = 'Vagrant' if vapp_prefix.nil?
+            if cfg.vapp_name
+              vapp_name = cfg.vapp_name
+            else
+              vapp_prefix = cfg.vapp_prefix
+              vapp_prefix = 'Vagrant' if vapp_prefix.nil?
+              vapp_name = "#{vapp_prefix}-#{Etc.getlogin}-#{Socket.gethostname.downcase}-" +
+                          "#{SecureRandom.hex(4)}"
+            end
 
             compose = cnx.compose_vapp_from_vm(
               cfg.vdc_id,
-              "#{vapp_prefix}-#{Etc.getlogin}-#{Socket.gethostname.downcase}-" +
-              "#{SecureRandom.hex(4)}",
+              vapp_name,
               "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].first.last[:id]
               },
-              network_options
+              network_options,
+              cfg
             )
             @logger.debug('Launch Compose vApp...')
             # Wait for the task to finish.
@@ -146,27 +284,12 @@ module VagrantPlugins
             # FIXME: Add a lot of error handling for each step here !
             if new_vapp
               env[:ui].success("vApp #{new_vapp[:name]} successfully created.")
-
-              # Add the vm id as machine.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: [#{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)
-
+              # add vapp metadata
+              if !cfg.metadata_vapp.nil?
+                env[:ui].info('Setting vApp metadata...')
+                set_metadata_vapp = cnx.set_vapp_metadata vapp_id, cfg.metadata_vapp
+                cnx.wait_task_completion(set_metadata_vapp)
+              end
             else
               env[:ui].error("vApp #{new_vapp[:name]} creation failed!")
               raise # FIXME: error handling missing.
@@ -180,7 +303,8 @@ module VagrantPlugins
               {
                 vm_name => cfg.catalog_item[:vms_hash].first.last[:id]
               },
-              network_options
+              network_options,
+              cfg
             )
 
             @logger.info('Waiting for the recompose task to complete ...')
@@ -190,31 +314,14 @@ module VagrantPlugins
 
             new_vapp = cnx.get_vapp(env[:machine].get_vapp_id)
             # FIXME: Add a lot of error handling for each step here !
-            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: ' +
-                "[#{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
+            if !new_vapp
               env[:ui].error("VM #{vm_name} add to #{new_vapp[:name]} failed!")
               raise
             end
           end
+          # Add the vm id as machine.id
+          new_vm_properties = new_vapp[:vms_hash].fetch(vm_name)
+          env[:machine].id = new_vm_properties[:id]
 
           @app.call env
         end