vagrant-vcloud 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2225b21d3d39c0bbd8be864bff61450e04989570
-  data.tar.gz: 0bb584b49730dcc825f6ee31cdce2f6c3026748c
+  metadata.gz: 029dca042c07fcb3034c6eba92c07f24d2f59c2e
+  data.tar.gz: aa3429ccf19e966599bb4aa4812f5c8cdd194184
 SHA512:
-  metadata.gz: c8ad741705b3c4d1761f7b6e9a96fd8e48c953dc4f212108d066d31179b1a0aa104821fd7a2b0768199a9b7606665c88a511f787b0d5a1c6046fed7793d8d4ab
-  data.tar.gz: ed8bb6a2e30c4217d43592c8eac7b4ab076d7d8b27992ff57561f1ac3b35c1997410716f679edfa15fd544df2e5a63ff8bfdd3bbbf8d4fac4a04c79a52e21ea8
+  metadata.gz: 9dded16f1a7f486d507006b29f7d5e7d87c83eb45b912f464227f93d99647943f3ec17bf2309c1343d3d09887780ee953e6ea49c6f8677eea3161dd1182c3c83
+  data.tar.gz: 83c9c33dc8d33a12f1dd2c16bb3a112f1f8b0bbcf32b529ddbbc9be8ea0c91b7478e99695e09cf2cb716ac699f745517b6ae392c2498ab73dfee0595f98b84ec

data/.gitignore

@@ -1,3 +1,6 @@
 .vagrant/*
 pkg/*
-Gemfile.lock
+Gemfile.lock
+test-*
+.yardoc/*
+doc/*

data/README.md

@@ -1,13 +1,24 @@
 [Vagrant](http://www.vagrantup.com) provider for VMware vCloud Director®
 =============
 
-[Version 0.1.0](https://github.com/frapposelli/vagrant-vcloud/releases/tag/v0.1.0) has been released!
+[Version 0.1.1](https://github.com/frapposelli/vagrant-vcloud/releases/tag/v0.1.1) 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.1.1 are:
+
+  - bugfix multiple sub allocation pools ranges [ISSUE #24]
+  - Putting back Google DNS as default if not specified
+  - binding vCloud 5.5 API on 5.1 driver
+  - Debug cut and general cosmetic cleanup
+  - added DNS choice using the "ip_dns" Array config property.
+  - Updated sync_folders.rb with code from vagrant-aws, Will focus on a better sync engine later in the future.
+  - Removed dependency on rest-client gem, moved everything to httpclient.
+  - Fixed destroy vApp bug.
+
 Features of Version 0.1.0 are:
 
 - Basic Create/Provision/Destroy lifecycle.
@@ -30,16 +41,27 @@ What is still missing:
 
 If you're a developer and want to lend us a hand, head over to our ```develop``` branch and get busy!
 
-A Sample Multi-VM Vagrantfile: 
+Install
+-------------
+
+Version 0.1.0 can be easily installed by running:
+
+```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.
+
+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.
 
 ```ruby
 precise32_vm_box_url = "http://vagrant.tsugliani.fr/precise32.box"
 
 nodes = [
-  { :hostname => "web-vm",  :box => "precise32", :box_url => precise32_vm_box_url},
-  { :hostname => "ssh-vm",  :box => "precise32" , :box_url => precise32_vm_box_url},
+  { :hostname => "web-vm",  :box => "precise32", :box_url => precise32_vm_box_url },
+  { :hostname => "ssh-vm",  :box => "precise32", :box_url => precise32_vm_box_url },
   { :hostname => "sql-vm",  :box => "precise32", :box_url => precise32_vm_box_url },
-  { :hostname => "lb-vm",  :box => "precise64", :box_url => precise32_vm_box_url },
+  { :hostname => "lb-vm",   :box => "precise64", :box_url => precise32_vm_box_url },
   { :hostname => "app-vm",  :box => "precise32", :box_url => precise32_vm_box_url },
 ]
 
@@ -77,4 +99,6 @@ Vagrant.configure("2") do |config|
     end
   end
 end
-```
+```
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/frapposelli/vagrant-vcloud/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

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

@@ -20,6 +20,14 @@ module VagrantPlugins
           cnx = cfg.vcloud_cnx.driver
           vmName = env[:machine].name
 
+          if cfg.ip_dns.nil?
+            dnsAddress1 = "8.8.8.8"
+            dnsAddress2 = "8.8.4.4"
+          else
+            dnsAddress1 = cfg.ip_dns.shift
+            dnsAddress2 = cfg.ip_dns.shift
+          end
+
           if !cfg.ip_subnet.nil?
 
             @logger.debug("Input address: #{cfg.ip_subnet}")
@@ -38,15 +46,17 @@ module VagrantPlugins
 
             @logger.debug("Range: #{rangeAddresses}")
 
-            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.
+            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.
 
             @logger.debug("Gateway IP: #{gatewayIp.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", 
@@ -58,12 +68,13 @@ module VagrantPlugins
               :ip_allocation_mode => "POOL",
               :parent_network =>  cfg.vdc_network_id,
               :enable_firewall => "false",
-              :dns1 => "8.8.8.8", # FIXME: We should let the user choose DNS servers and then 
-              :dns2 => "8.8.4.4"  # fall back to Google's if they're not specified.
+              :dns1 => dnsAddress1,
+              :dns2 => dnsAddress2
             }
 
           else
 
+            @logger.debug("DNS1: #{dnsAddress1} DNS2: #{dnsAddress2}")
             # No IP subnet specified, reverting to defaults
             network_options = { 
               :name => "Vagrant-vApp-Net", 
@@ -75,8 +86,8 @@ module VagrantPlugins
               :ip_allocation_mode => "POOL",
               :parent_network =>  cfg.vdc_network_id,
               :enable_firewall => "false",
-              :dns1 => "8.8.8.8",
-              :dns2 => "8.8.4.4"
+              :dns1 => dnsAddress1,
+              :dns2 => dnsAddress2
             }
 
           end
@@ -115,28 +126,25 @@ module VagrantPlugins
             # FIXME: Add a lot of error handling for each step here !
 
             if newVApp
-              env[:ui].success("vApp #{newVApp[:name]} created successfully!")
+              env[:ui].success("vApp #{newVApp[:name]} successfully created.")
 
               # Add the vm id as machine.id
               newVMProperties = newVApp[:vms_hash].fetch(vmName)
               env[:machine].id = newVMProperties[:id]
 
               ### SET GUEST CONFIG
-              #env[:ui].info("Setting Guest Customization on ID: [#{vmName}] of vApp [#{newVApp[:name]}]")
+
+              @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("Starting VM [#{vmName}] - this will take a while as vShield Edge is getting deployed as well")
-#              env[:ui].info("Starting VM [#{vmName}] - this will take a while as vShield Edge is getting deployed as well")
-#              poweronVM = cnx.poweron_vm(newVMProperties[:id])
-#              cnx.wait_task_completion(poweronVM)
-
             else
               env[:ui].error("vApp #{newVApp[:name]} creation failed!")
-              raise
+              raise # FIXME: error handling missing.
            end 
           else
             env[:ui].info("Adding VM to existing vApp...")
@@ -160,27 +168,19 @@ module VagrantPlugins
 
             if newVApp
 
-              #env[:ui].success("VM #{vmName} added to #{newVApp[:name]} successfully!")
-              #@logger.info("VM #{vmName} added to #{newVApp[:name]} successfully!")
-
-              # Add the vm id as machine.id
               newVMProperties = newVApp[:vms_hash].fetch(vmName)
               env[:machine].id = newVMProperties[:id]
 
               ### SET GUEST CONFIG
-              #@logger.info("Setting Guest Customization on ID: [#{newVMProperties[:id]}] of vApp [#{newVApp[:name]}]")
-              #env[:ui].info("Setting Guest Customization on ID: [#{vmName}] of vApp [#{newVApp[:name]}]")
+              
+              @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("Starting VM [#{vmName}]")
-#              env[:ui].info("Starting VM [#{vmName}]")
-#              poweronVM = cnx.poweron_vm(newVMProperties[:id])
-#              cnx.wait_task_completion(poweronVM)
-
             else
 
               env[:ui].error("VM #{vmName} add to #{newVApp[:name]} failed!")

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

@@ -1,4 +1,3 @@
-#require "vcloud-rest/connection"
 require "log4r"
 
 module VagrantPlugins

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

@@ -28,20 +28,12 @@ module VagrantPlugins
             env[:ui].info("Single VM left in the vApp, destroying the vApp...")
 
             if cfg.vdc_edge_gateway_ip && cfg.vdc_edge_gateway
-              env[:ui].info("Removing mapping for ip #{cfg.vdc_edge_gateway_ip} on Edge #{cfg.vdc_edge_gateway}.")
+              env[:ui].info("Removing NAT rules on [#{cfg.vdc_edge_gateway}] for IP [#{cfg.vdc_edge_gateway_ip}].")
               @logger.debug("Deleting Edge Gateway rules - vdc id: #{cfg.vdc_id}")
               edge_remove = cnx.remove_edge_gateway_rules(cfg.vdc_edge_gateway, cfg.vdc_id, cfg.vdc_edge_gateway_ip, vAppId)
               cnx.wait_task_completion(edge_remove)
             end
 
-            env[:ui].info("Powering off vApp...")
-            vAppStopTask = cnx.poweroff_vapp(vAppId)
-            vAppStopWait = cnx.wait_task_completion(vAppStopTask)
-
-            if !vAppStopWait[:errormsg].nil?
-              raise Errors::StopVAppError, :message => vAppStopWait[:errormsg]
-            end
-
             env[:ui].info("Destroying vApp...")
             vAppDeleteTask = cnx.delete_vapp(vAppId)
             @logger.debug("vApp Delete task id #{vAppDeleteTask}")

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

@@ -18,8 +18,6 @@ module VagrantPlugins
           # Get the ports we're forwarding
           env[:forwarded_ports] ||= compile_forwarded_ports(env[:machine].config)
 
-          @logger.debug("WE'RE GOING TO FORWARD THIS!: #{@env[:forwarded_ports]}")
-
           forward_ports
 
           @app.call(env)
@@ -28,8 +26,6 @@ module VagrantPlugins
         def forward_ports
           ports = []
 
-          # interfaces = @env[:machine].provider.driver.read_network_interfaces
-
           cfg = @env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
           vmName = @env[:machine].name
@@ -49,28 +45,8 @@ module VagrantPlugins
               :host_port => fp.host_port
             }
 
-            # Assuming the only reason to establish port forwarding is
-            # because the VM is using Virtualbox NAT networking. Host-only
-            # bridged networking don't require port-forwarding and establishing
-            # forwarded ports on these attachment types has uncertain behaviour.
             @env[:ui].info("Forwarding Ports: VM port #{fp.guest_port} -> vShield Edge port #{fp.host_port}")
 
-            # Verify we have the network interface to attach to
-            # if !interfaces[fp.adapter]
-            #   raise Vagrant::Errors::ForwardPortAdapterNotFound,
-            #     :adapter => fp.adapter.to_s,
-            #     :guest => fp.guest_port.to_s,
-            #     :host => fp.host_port.to_s
-            # end
-
-            # Port forwarding requires the network interface to be a NAT interface,
-            # so verify that that is the case.
-            # if interfaces[fp.adapter][:type] != :nat
-            #   @env[:ui].info(I18n.t("vagrant.actions.vm.forward_ports.non_nat",
-            #                         message_attributes))
-            #   next
-            # end
-
             # Add the options to the ports array to send to the driver later
             ports << {
               :guestip   => fp.guest_ip,
@@ -85,20 +61,11 @@ module VagrantPlugins
 
           if !ports.empty?
             # We only need to forward ports if there are any to forward
-
-            @logger.debug("Here's what we should pass to the driver method: #{ports.inspect}")
-            @logger.debug("here's our network id #{cfg.vdc_network_id}")
-            # @env[:machine].provider.driver.forward_ports(ports)
-
-            # newvapp[:vms_hash].each do |key, value|
-
-            # nat_rules << { :nat_external_port => j.to_s, :nat_internal_port => "873", :nat_protocol => "UDP", :vm_scoped_local_id => value[:vapp_scoped_local_id]}
-            # j += 1
+            @logger.debug("Port object to be passed: #{ports.inspect}")
+            @logger.debug("Current network id #{cfg.vdc_network_id}")
 
             ### Here we apply the nat_rules to the vApp we just built
 
-            # puts "### Applying Port Forwarding NAT Rules"
-
             addports = cnx.add_vapp_port_forwarding_rules(
               vAppId,
               "Vagrant-vApp-Net",
@@ -115,11 +82,8 @@ module VagrantPlugins
               raise Errors::ComposeVAppError, :message => wait[:errormsg]
             end
 
-
           end
 
-
-
         end
       end
     end

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

@@ -33,15 +33,11 @@ module VagrantPlugins
           # Determine a list of usable ports for repair
           usable_ports = Set.new(env[:machine].config.vm.usable_port_range)
 
-          @logger.debug("USABLE PORTS: #{usable_ports.inspect}")
-
           # Pass one, remove all defined host ports from usable ports
           with_forwarded_ports(env) do |options|
             usable_ports.delete(options[:host])
           end
 
-          @logger.debug("USABLE PORTS AFTER IN USE DELETION: #{usable_ports.inspect}")
-
           cfg = env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
           vmName = env[:machine].name
@@ -59,12 +55,8 @@ module VagrantPlugins
             guest_port = options[:guest]
             host_port  = options[:host]
 
-            #testHash = rules.flatten
-            @logger.debug("DEBUGGING NETWORKS: rules: #{rules.inspect}")         
-
             # If the port is open (listening for TCP connections)
             if rules.include?(host_port)
-              @logger.debug("SO OUR PORT IS INCLUDED IN RULES BUT WHAT'S IN OPTIONS?: #{options.inspect}")
               if !options[:auto_correct]
                 raise Errors::ForwardPortCollision,
                   :guest_port => guest_port.to_s,

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

@@ -27,7 +27,7 @@ module VagrantPlugins
 
           boxOVF = "#{boxDir}/#{boxFile}.ovf"
 
-          ### Still relying on ruby-progressbar because report_progress basically sucks.
+          # Still relying on ruby-progressbar because report_progress basically sucks.
 
           @logger.debug("OVF File: #{boxOVF}")
           uploadOVF = cnx.upload_ovf(
@@ -38,6 +38,7 @@ module VagrantPlugins
             cfg.catalog_id,
             {
               :progressbar_enable => true
+              # FIXME: export chunksize as a parameter and lower the default to 1M.
               #:chunksize => 262144
             }
           )
@@ -49,7 +50,7 @@ module VagrantPlugins
             raise Errors::CatalogAddError, :message => addOVFtoCatalog[:errormsg]
           end
 
-          ## Retrieve catalog_item ID
+          # Retrieve catalog_item ID
           cfg.catalog_item = cnx.get_catalog_item_by_name(cfg.catalog_id, env[:machine].box.name.to_s)
 
         end
@@ -63,7 +64,7 @@ module VagrantPlugins
 
           @logger.debug("Catalog Creation result: #{catalogCreation.inspect}")
 
-          env[:ui].info("Catalog [#{cfg.catalog_name}] created successfully.")
+          env[:ui].info("Catalog [#{cfg.catalog_name}] successfully created.")
 
           cfg.catalog_id = catalogCreation[:catalog_id]
 
@@ -83,11 +84,7 @@ module VagrantPlugins
 
           cfg.catalog = cnx.get_catalog_by_name(cfg.org, cfg.catalog_name)
           
-
-          @logger.debug("BEFORE get_catalog_id_by_name")          
           cfg.catalog_id = cnx.get_catalog_id_by_name(cfg.org, cfg.catalog_name)
-          @logger.debug("AFTER get_catalog_id_by_name: #{cfg.catalog_id}")
-
 
           if cfg.catalog_id.nil?
             env[:ui].warn("Catalog [#{cfg.catalog_name}] does not exist!")
@@ -96,12 +93,12 @@ module VagrantPlugins
               "Would you like to create the [#{cfg.catalog_name}] catalog?\nChoice (yes/no): "
             )
 
-            # FIXME: add an OR clause for just Y
-            if user_input.downcase == "yes"
+            if user_input.downcase == "yes" || user_input.downcase == "y" 
               vcloud_create_catalog(env)
             else
               env[:ui].error("Catalog not created, exiting...")
 
+              # FIXME: wrong error message
               raise VagrantPlugins::VCloud::Errors::VCloudError, 
                     :message => "Catalog not available, exiting..."
 
@@ -118,6 +115,8 @@ module VagrantPlugins
           # Checking Catalog mandatory requirements
           if !cfg.catalog_id
             @logger.info("Catalog [#{cfg.catalog_name}] STILL does not exist!")
+
+              # FIXME: wrong error message
               raise VagrantPlugins::VCloud::Errors::VCloudError, 
                     :message => "Catalog not available, exiting..."
 
@@ -133,20 +132,20 @@ module VagrantPlugins
               "[#{cfg.catalog_name}] Catalog?\nChoice (yes/no): "
             )
 
-            # FIXME: add an OR clause for just Y
-            if user_input.downcase == "yes"
+            if user_input.downcase == "yes" || user_input.downcase == "y" 
               env[:ui].info("Uploading [#{env[:machine].box.name.to_s}]...")
               vcloud_upload_box(env)
             else
               env[:ui].error("Catalog item not available, exiting...")
 
+              # FIXME: wrong error message
               raise VagrantPlugins::VCloud::Errors::VCloudError, 
                     :message => "Catalog item not available, exiting..."
 
             end
 
           else
-            #env[:ui].info("Using catalog item [#{env[:machine].box.name.to_s}] in Catalog [#{cfg.catalog_name}]...")
+            @logger.info("Using catalog item [#{env[:machine].box.name.to_s}] in Catalog [#{cfg.catalog_name}]...")
           end
         end
 

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

@@ -19,10 +19,28 @@ module VagrantPlugins
           vmId = env[:machine].id
           vmName = env[:machine].name
 
-          env[:ui].info("Powering off VM...")
-          task_id = cnx.poweroff_vm(vmId)
-          wait = cnx.wait_task_completion(task_id)
-          
+          testvApp = cnx.get_vapp(vAppId)
+
+          @logger.debug("Number of VMs in the vApp: #{testvApp[:vms_hash].count}")
+
+          if testvApp[:vms_hash].count == 1
+
+            # Poweroff vApp
+            env[:ui].info("Powering off vApp...")
+            vAppStopTask = cnx.poweroff_vapp(vAppId)
+            vAppStopWait = cnx.wait_task_completion(vAppStopTask)
+
+            if !vAppStopWait[:errormsg].nil?
+              raise Errors::StopVAppError, :message => vAppStopWait[:errormsg]
+            end
+
+          else
+            # Poweroff VM
+            env[:ui].info("Powering off VM...")
+            task_id = cnx.poweroff_vm(vmId)
+            wait = cnx.wait_task_completion(task_id)
+          end
+
           true
 
           @app.call env

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

@@ -27,7 +27,9 @@ module VagrantPlugins
 
         if testIp.nil? && cfg.vdc_edge_gateway_ip && cfg.vdc_edge_gateway
           @logger.debug("This is our first boot, we should map ports on org edge!")
-          env[:ui].info("Mapping ip #{cfg.vdc_edge_gateway_ip} on Edge #{cfg.vdc_edge_gateway} as our entry point.")
+
+          env[:ui].info("Creating NAT rules on [#{cfg.vdc_edge_gateway}] for IP [#{cfg.vdc_edge_gateway_ip}].")
+
           edgeMap = cnx.set_edge_gateway_rules(cfg.vdc_edge_gateway, cfg.vdc_id, cfg.vdc_edge_gateway_ip, vAppId)
           cnx.wait_task_completion(edgeMap)
         end

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

@@ -1,5 +1,3 @@
-require "awesome_print"
-
 module VagrantPlugins
   module VCloud
     module Action
@@ -42,10 +40,7 @@ module VagrantPlugins
           rules = cnx.get_vapp_port_forwarding_rules(vAppId)
           
           rules.each do |rule|
-            if rule[:vapp_scoped_local_id] == myhash[:vapp_scoped_local_id] && rule[:nat_internal_port] == "22"
-
-              @logger.debug("Our variables: IP #{rule[:nat_external_ip]} and Port #{rule[:nat_external_port]}")
-              
+            if rule[:vapp_scoped_local_id] == myhash[:vapp_scoped_local_id] && rule[:nat_internal_port] == "22"              
               @externalIP = rule[:nat_external_ip]
               @externalPort = rule[:nat_external_port]
               break
@@ -57,6 +52,9 @@ module VagrantPlugins
             @externalIP = cfg.vdc_edge_gateway_ip
           end
 
+          # FIXME: fix the selfs and create a meaningful info message
+          # @logger.debug("Our variables: IP #{@externalIP} and Port #{@externalPort}")
+
           return {
             # FIXME: these shouldn't be self
               :host => @externalIP,

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

@@ -1,7 +1,27 @@
+# The MIT License (MIT)
+# Copyright (c) 2013 Mitchell Hashimoto
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy of 
+# this software and associated documentation files (the "Software"), to deal in 
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is furnished to do 
+# so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require "log4r"
 require "vagrant/util/subprocess"
 require "vagrant/util/scoped_hash_override"
-require "unison"
+require "vagrant/util/which"
 
 module VagrantPlugins
   module VCloud
@@ -27,6 +47,11 @@ module VagrantPlugins
             # Ignore disabled shared folders
             next if data[:disabled]
 
+            unless Vagrant::Util::Which.which('rsync')
+              env[:ui].warn(I18n.t('vagrant_vcloud.rsync_not_found_warning'))
+              break
+            end
+
             hostpath  = File.expand_path(data[:hostpath], env[:root_path])
             guestpath = data[:guestpath]
 
@@ -34,11 +59,14 @@ module VagrantPlugins
             # avoid creating an additional directory with rsync
             hostpath = "#{hostpath}/" if hostpath !~ /\/$/
 
-            @logger.debug("RSYNCING OVER #{hostpath} to #{guestpath}")
+            # on windows rsync.exe requires cygdrive-style paths
+            if Vagrant::Util::Platform.windows?
+              hostpath = hostpath.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
+            end
 
-            # env[:ui].info(I18n.t("vagrant_aws.rsync_folder",
-            #                     :hostpath => hostpath,
-            #                     :guestpath => guestpath))
+            env[:ui].info(I18n.t("vagrant_vcloud.rsync_folder",
+                                :hostpath => hostpath,
+                                :guestpath => guestpath))
 
             # Create the host path if it doesn't exist and option flag is set
             if data[:create]
@@ -59,11 +87,17 @@ module VagrantPlugins
             # Rsync over to the guest path using the SSH info
             command = [
               "rsync", "--verbose", "--archive", "-z",
-              "--exclude", ".vagrant/",
+              "--exclude", ".vagrant/", "--exclude", "Vagrantfile",
               "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 
+            # we need to fix permissions when using rsync.exe on windows, see
+            # http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
+            if Vagrant::Util::Platform.windows?
+              command.insert(1, "--chmod", "ugo=rwX")
+            end
+
             r = Vagrant::Util::Subprocess.execute(*command)
             if r.exit_code != 0
               raise Errors::RsyncError,
@@ -76,7 +110,4 @@ module VagrantPlugins
       end
     end
   end
-end
-
-
- 
+end

data/lib/vagrant-vcloud/config.rb

@@ -63,6 +63,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :ip_subnet
 
+      # DNS
+      #
+      # @return [Array]
+      attr_accessor :ip_dns
+
       # Port forwarding rules
       #
       # @return [Hash]
@@ -116,14 +121,17 @@ module VagrantPlugins
         errors = _detected_errors
 
         # TODO: add blank?
-        errors << I18n.t("config.hostname") if hostname.nil?
-        errors << I18n.t("config.org_name") if org_name.nil?
-        errors << I18n.t("config.username") if username.nil?
-        errors << I18n.t("config.password") if password.nil?
+        errors << I18n.t("vagrant_vcloud.config.hostname") if hostname.nil?
+        errors << I18n.t("vagrant_vcloud.config.org_name") if org_name.nil?
+        errors << I18n.t("vagrant_vcloud.config.username") if username.nil?
+        errors << I18n.t("vagrant_vcloud.config.password") if password.nil?
         
-        errors << I18n.t("config.catalog_name") if catalog_name.nil?
-        errors << I18n.t("config.vdc_name") if vdc_name.nil?
-        errors << I18n.t("config.vdc_network_name") if vdc_network_name.nil?
+        if !ip_dns.nil?
+          errors << I18n.t("vagrant_vcloud.config.ip_dns") if !ip_dns.kind_of?(Array)
+        end
+        errors << I18n.t("vagrant_vcloud.config.catalog_name") if catalog_name.nil?
+        errors << I18n.t("vagrant_vcloud.config.vdc_name") if vdc_name.nil?
+        errors << I18n.t("vagrant_vcloud.config.vdc_network_name") if vdc_network_name.nil?
 
         { "vCloud Provider" => errors }
       end