Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rsync folders by Vagrant core code #66

Merged
merged 2 commits into from
Jul 7, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions lib/vSphere/action.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ def self.action_provision
end

b3.use Provision
b3.use SyncFolders
end
b3.use SyncedFolders
end
end
end
end
Expand Down Expand Up @@ -104,7 +104,7 @@ def self.action_up
end
b.use CloseVSphere
b.use Provision
b.use SyncFolders
b.use SyncedFolders
end
end

Expand Down Expand Up @@ -165,7 +165,6 @@ def self.action_get_ssh_info
autoload :MessageNotRunning, action_root.join('message_not_running')
autoload :PowerOff, action_root.join('power_off')
autoload :PowerOn, action_root.join('power_on')
autoload :SyncFolders, action_root.join('sync_folders')
end
end
end
Expand Down
94 changes: 0 additions & 94 deletions lib/vSphere/action/sync_folders.rb

This file was deleted.

3 changes: 0 additions & 3 deletions lib/vSphere/errors.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ module Errors
class VSphereError < Vagrant::Errors::VagrantError
error_namespace('vsphere.errors')
end
class RsyncError < VSphereError
error_key(:rsync_error)
end
end
end
end
12 changes: 11 additions & 1 deletion lib/vSphere/plugin.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
require 'vagrant'
begin
require "vagrant"
rescue LoadError
raise "The Vagrant vSphere plugin must be run within Vagrant."
end

# This is a sanity check to make sure no one is attempting to install
# this into an early Vagrant version.
if Vagrant::VERSION < "1.5"
raise "The Vagrant vSphere plugin is only compatible with Vagrant 1.5+"
end

module VagrantPlugins
module VSphere
Expand Down
13 changes: 0 additions & 13 deletions locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ en:
The VM is not running
waiting_for_ssh: |-
Waiting for SSH to become available...
rsync_folder: |-
Rsyncing folder: %{hostpath} => %{guestpath}

errors:
missing_template: |-
Expand All @@ -36,19 +34,8 @@ en:
Configured configuration spec not found
missing_datastore: |-
Configured data store not found
rsync_error: |-
There was an error when attemping to rsync a share folder.
Please inspect the error message below for more info.

Host path: %{hostpath}
Guest path: %{guestpath}
Error: %{stderr}
too_many_private_networks: |-
There a more private networks configured than can be assigned to the customization spec
rsync_not_found: |-
Warning! Folder sync disabled because the rsync binary is
missing. Make sure rsync is installed and the binary can
be found in PATH.
config:
host: |-
Configuration must specify a vSphere host
Expand Down