opennebula-provider 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 753be50194ecd2d0c573840a7fb997ab622b62cb
-  data.tar.gz: 9e77a6f1d671f31a0386364382f49a8ba1bbc9b0
+  metadata.gz: d7cb6962f3a15c06a587d0facb4dfb8d9fc0b920
+  data.tar.gz: 3c5e3590dcff842f5c8c39e19cc10120f90a0c85
 SHA512:
-  metadata.gz: bccbbe688599ee01de187e781d7772f9b1bbabe6e07ef3238fc66f37c5aa62887a6af39d7c7587d03e0db210f0e8dd52363b119d4e700c91192ac5019ce9206d
-  data.tar.gz: e8ec8dafdb2fc509dd0679d758f3f4d7a39f67eb2fdbc68cb67b35a25171fbaea8cc29f781694699624ac4727fbec1ff149b65cfc7c836f1d07245831a6a96a4
+  metadata.gz: 4927b9168112e605ef83f8708877589e257f462b40a91dc9361f35019d90b13e95910142b1e808618514a741b114d6a6d806b514232f43e2832f68707252a17e
+  data.tar.gz: 9d02b553bc764ecbe055e1276d6614ee32171178ccc5459d7b1cfa31d591f9d7deef853e3ca89996e5e9df8c040e08623d17d92171c2abddef36679fd5acd2f0

data/lib/opennebula-provider/action.rb

@@ -4,7 +4,6 @@ require_relative 'action/destroy'
 require_relative 'action/messages'
 require_relative 'action/read_ssh_info'
 require_relative 'action/resume'
-require_relative 'action/sync_folders'
 require_relative 'action/start'
 require_relative 'action/stop'
 require_relative 'action/suspend'
@@ -45,6 +44,7 @@ module VagrantPlugins
             case env[:machine_state]
             when :active
               b1.use MessageAlreadyCreated
+              next
             when :suspended
               # TODO: uncomment this with patching fog
               # b1.use Resume
@@ -57,6 +57,7 @@ module VagrantPlugins
               next
             end
             b1.use WaitForCommunicator, [:pending, :prolog, :boot, :active]
+            b1.use SyncedFolders
           end
         end
       end
@@ -152,7 +153,6 @@ module VagrantPlugins
               b1.use MessageHalted
             else
               b1.use Provision
-              b1.use SyncFolders
             end
           end
         end

data/lib/opennebula-provider/errors.rb

@@ -29,9 +29,6 @@ module VagrantPlugins
         error_key(:quota)
       end
 
-      class RsyncError < OpenNebulaProviderError
-        error_key(:rsync)
-      end
     end
   end
 end

data/lib/opennebula-provider/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenNebulaProvider
-    VERSION = '1.0.5'
+    VERSION = '1.1.0'
   end
 end

data/locales/en.yml

@@ -35,11 +35,6 @@ en:
         Resuming instance...
       waiting_for_sshd: |-
         Instance is active, waiting for sshd daemon startup...
-      rsyncing: |-
-        Rsyncing folder: %{hostpath} => %{guestpath}...
-      rsync_not_found_warning: |-
-        Warning! Folder sync disabled because the rsync binary is missing in the %{side}.
-        Make sure rsync is installed and the binary can be found in the PATH.
       error: |-
         The instance is in error state
 
@@ -120,5 +115,3 @@ en:
         Resource error! %{error}
       quota: |-
         Quota error! %{error}
-      rsync: |-
-        Rsync error! %{stderr}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-provider
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Cherdancev Evgeni
@@ -112,7 +112,6 @@ files:
 - lib/opennebula-provider/action/start.rb
 - lib/opennebula-provider/action/stop.rb
 - lib/opennebula-provider/action/suspend.rb
-- lib/opennebula-provider/action/sync_folders.rb
 - lib/opennebula-provider/action/wait_for_ssh.rb
 - lib/opennebula-provider/action/wait_for_state.rb
 - lib/opennebula-provider/config.rb

data/lib/opennebula-provider/action/sync_folders.rb

@@ -1,97 +0,0 @@
-require 'vagrant/util/subprocess'
-require 'vagrant/util/which'
-
-module VagrantPlugins
-  module OpenNebulaProvider
-    module Action
-      class SyncFolders
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new('vagrant::provider::opennebula::sync_folders')
-        end
-
-        def call(env)
-          @app.call(env)
-
-          ssh_info = env[:machine].ssh_info
-
-          unless Vagrant::Util::Which.which('rsync')
-            env[:ui].warn(I18n.t('opennebula_provider.info.rsync_not_found_warning', side: 'host'))
-            return
-          end
-
-          if env[:machine].communicate.execute('which rsync', error_check: false) != 0
-            env[:ui].warn(I18n.t('opennebula_provider.info.rsync_not_found_warning', side: 'guest'))
-            return
-          end
-
-          env[:machine].config.vm.synced_folders.each do |id, data|
-            # Ignore disabled shared folders
-            next if data[:disabled]
-
-            hostpath  = File.expand_path(data[:hostpath], env[:root_path])
-            guestpath = data[:guestpath]
-
-            # Make sure there is a trailing slash on the host path to
-            # avoid creating an additional directory with rsync
-            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
-
-            # 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('opennebula_provider.info.rsyncing', hostpath: hostpath, guestpath: guestpath))
-
-            # Create the host path if it doesn't exist and option flag is set
-            if data[:create]
-              begin
-                FileUtils.mkdir_p(hostpath)
-              rescue => err
-                raise Errors::MkdirError,
-                      hostpath: hostpath,
-                      err: err
-              end
-            end
-
-            # Create the guest path
-            env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
-            env[:machine].communicate.sudo(
-              "chown -R #{ssh_info[:username]} '#{guestpath}'")
-
-            # collect rsync excludes specified :rsync__exclude=>['path1',...] in synced_folder options
-            excludes = ['.vagrant/', 'Vagrantfile', *Array(data[:rsync__exclude])].uniq
-
-            # Rsync over to the guest path using the SSH info
-            command = [
-              'rsync', '--verbose', '--archive', '-z',
-              *excludes.map { |e| ['--exclude', e] }.flatten,
-              '-e', "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{ssh_key_options(ssh_info)}",
-              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
-              fail Errors::RsyncError,
-                   guestpath: guestpath,
-                   hostpath: hostpath,
-                   stderr: r.stderr
-            end
-          end
-        end
-
-        private
-
-        def ssh_key_options(ssh_info)
-          # Ensure that `private_key_path` is an Array (for Vagrant < 1.4)
-          Array(ssh_info[:private_key_path]).map { |path| "-i '#{path}' " }.join
-        end
-      end
-    end
-  end
-end