vagrant-managed-servers 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 642be23bb2dc3eae5795ff4916dc95d061d8a886
-  data.tar.gz: f35c644748e1ad9fba5a7f62b7efa019b23bdf59
+  metadata.gz: 7af13283657a3d769ae1cc914ce9fba26b821f9e
+  data.tar.gz: 2dd6a83ed804003cc01c3002414c6394a003c609
 SHA512:
-  metadata.gz: c6e9125a1770c924679aa18c71dc384ba0d9ae285aa202a4e625e933fb49b0f9cd76b4ba3ae3f1d0f6ef05e27b0a590ddbd5399ecbeb7fccae509fa755e7b87a
-  data.tar.gz: 0f8f5a8e007d996fea2c627ff7f6824377a18108169b7edd1b9a82720c94fd698cc24520839ec914015982ee8328e67add9a5d4dab7dff6019467d5fb81d63bf
+  metadata.gz: a67a524ffd92a39588970e47945cc664045ee2368e5426b70e756297968dedf68b30ba6c904f03ed98e42d1c823dec1d5d2cb0431a52ced607079c4114d12dc1
+  data.tar.gz: 5fe6c439253f17e6451bd4b64601626323f941f2dbdb5e6a9c0cf00ee1125c4841f1a05d4dcf97610f9da0bc155f182a70e047d0fbf31d6f1162f58247295529

data/Berksfile

@@ -1,4 +1,4 @@
-source "https://supermarket.getchef.com"
+source "https://supermarket.chef.io"
 
 cookbook 'apt'
-cookbook 'apache2'
+cookbook 'apache2'

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 
 # Changelog
 
+## 0.7.0 (released 2015-05-22)
+
+* extract the WinRM synced folder mechanism into [a separate plugin](https://github.com/Cimpress-MCP/vagrant-winrm-syncedfolders) (see [#47](https://github.com/tknerr/vagrant-managed-servers/pull/47), thanks @chrisbaldauf!)
+* use the `Vagrant::Action::Builtin::SyncedFolders` for provisioning windows guests. This will use (the much faster) SMB synced folders if possible (see [README](https://github.com/tknerr/vagrant-managed-servers#synced-folders-windows)), otherwise fall back to the WinRM implementation above (see [#46](https://github.com/tknerr/vagrant-managed-servers/issues/46), thanks @chrisbaldauf!)
+* clean up the example Vagrantfile and add windows examples [#48](https://github.com/tknerr/vagrant-managed-servers/pull/48)
+
 ## 0.6.2 (released 2015-04-30)
 
 * fix bug where WinRM file sync fails occasionally (retry 3 times) ([#43](https://github.com/tknerr/vagrant-managed-servers/issues/43), thanks @chrisbaldauf!)

data/Gemfile

@@ -6,11 +6,12 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", ref: "v1.7.2"
 end
 
 group :plugins do
   gem "vagrant-managed-servers", path: "."
   gem "vagrant-omnibus", "1.4.1"
-  gem "vagrant-berkshelf", "3.0.1"
-end
+  gem "vagrant-berkshelf", "4.0.4"
+  gem "vagrant-winrm-syncedfolders"
+end

data/README.md

@@ -19,7 +19,7 @@ Credits: this provider was initially based on the [vagrant-aws](https://github.c
 * SSH into managed servers.
 * Provision managed servers with any built-in Vagrant provisioner.
 * Reboot a managed server.
-* Minimal synced folder support via `rsync`.
+* Synced folder support.
 
 ## Usage
 
@@ -133,10 +133,9 @@ specified, Vagrant will emit a warning and just ignore it.
 
 ## Synced Folders
 
-There is minimal support for synced folders. Upon `vagrant provision`,
-the managed servers provider will use
-`rsync` (if available) to uni-directionally sync the folder to
-the remote machine over SSH.
+There is minimal synced folders support for provisioning linux guests
+via rsync, and for windows guests via either smb, winrm or rsync
+([see below](https://github.com/tknerr/vagrant-managed-servers#synced-folders-windows)).
 
 This is good enough for all built-in Vagrant provisioners (shell,
 chef, and puppet) to work!
@@ -163,12 +162,18 @@ config.vm.define 'my-windows-server' do |windows|
   end
 end
 ```
-Synchronization of files using WinRM is known to be slow, so it is recommended
-that you disable synched folders that aren't critical. For instance, to disable the
-default /vagrant share, you could use the following code:
+
+### Synced Folders (Windows)
+Vagrant Managed Servers will try several different mechanisms to sync folders for Windows guests. In order of priority:
+
+1. [SMB](http://docs.vagrantup.com/v2/synced-folders/smb.html) - requires running from a Windows host, an Administrative console, and Powershell 3 or greater. Note that there is a known [bug](https://github.com/mitchellh/vagrant/issues/3139) which causes the Powershell version check to hang for Powershell 2
+2. [WinRM](https://github.com/cimpress-mcp/vagrant-winrm-syncedfolders) - uses the WinRM communicator and is reliable, but can be slow for large numbers of files.
+3. [RSync](http://docs.vagrantup.com/v2/synced-folders/rsync.html) - requires `rsync.exe` installed and on your path.
+
+Vagrant will try to use the best folder synchronization mechanism given your host and guest capabilities, but you can force a different type of folder sync with the `type` parameter of the `synced_folder` property in your Vagrantfile.
 
 ```ruby
-windows.vm.synced_folder '.', '/vagrant', disabled: true
+windows.vm.synced_folder '.', '/vagrant', type: "winrm"
 ```
 
 ## Development
@@ -190,20 +195,20 @@ If those pass, you're ready to start developing the plugin. You can test
 the plugin without installing it into your Vagrant environment by using the
 `Vagrantfile` in the top level of this directory and use bundler to execute Vagrant.
 
-First, fake a managed server by bringing up the `fake_managed_server` vagrant VM with the default virtualbox provider:
+First, let's pretend we have a managed server by bringing up the `local_linux` vagrant VM with the default virtualbox provider:
 
 ```
-$ bundle exec vagrant up fake_managed_server
+$ bundle exec vagrant up local_linux
 ```
 
-Now you can use the managed provider (defined in a separate VM named `my_server`) to ssh into or provision the (fake) managed server:
+Now you can use the managed provider (defined in a separate VM named `managed_linux`) to ssh into or provision the actual managed server:
 
 ```
 $ # link vagrant with the server
-$ bundle exec vagrant up my_server --provider=managed
+$ bundle exec vagrant up managed_linux --provider=managed
 $ # ssh / provision
-$ bundle exec vagrant ssh my_server
-$ bundle exec vagrant provision my_server
+$ bundle exec vagrant ssh managed_linux
+$ bundle exec vagrant provision managed_linux
 $ # unlink
-$ bundle exec vagrant destroy my_server
+$ bundle exec vagrant destroy managed_linux
 ```

data/Rakefile

@@ -13,12 +13,15 @@ task :default => "spec"
 
 desc "runs the acceptance \"test\" as described in README"
 task :acceptance do
-  begin
-    sh "vagrant up fake_managed_server"
-    sh "vagrant up my_server --provider=managed"
-    sh "vagrant provision my_server"
-    sh "vagrant reload my_server"
-  ensure
-    sh "vagrant destroy -f"
+  ['linux', 'windows'].each do |os|
+    begin
+      sh "vagrant up local_#{os}"
+      sh "vagrant up managed_#{os} --provider=managed"
+      sh "vagrant provision managed_#{os}"
+      sh "vagrant reload managed_#{os}"
+    ensure
+      sh "vagrant destroy -f managed_#{os}"
+      sh "vagrant destroy -f local_#{os}"
+    end
   end
 end

data/Vagrantfile

@@ -4,35 +4,66 @@
 Vagrant.configure("2") do |config|
 
   #
-  # fake a managed server by bringing up a virtualbox vm
+  # fake a managed linux server by bringing up a virtualbox vm
   #
-  config.vm.define :fake_managed_server do |fms_config|
-    fms_config.vm.box = "chef/ubuntu-12.04-i386"
-    fms_config.vm.network :private_network, ip: "192.168.40.35"
-    fms_config.berkshelf.enabled = false
+  config.vm.define :local_linux do |ll_config|
+    ll_config.vm.box = "chef/ubuntu-12.04-i386"
+    ll_config.vm.network :private_network, ip: "192.168.40.35"
+    ll_config.berkshelf.enabled = false
+    ll_config.vm.synced_folder ".", "/vagrant", disabled: true
   end
 
   #
-  # configure managed provider to connect to `fake_managed_server`
+  # configure managed provider to connect to `local_linux`
   #
-  config.vm.define :my_server do |ms_config|
+  config.vm.define :managed_linux do |ml_config|
 
-    ms_config.vm.box = "tknerr/managed-server-dummy"
+    ml_config.vm.box = "tknerr/managed-server-dummy"
 
-    ms_config.omnibus.chef_version = "12.0.3"
-    ms_config.berkshelf.enabled = true
-  
-    ms_config.vm.provider :managed do |managed_config, override|
+    ml_config.omnibus.chef_version = "12.0.3"
+    ml_config.berkshelf.enabled = true
+
+    ml_config.vm.provider :managed do |managed_config, override|
       managed_config.server = "192.168.40.35"
       override.ssh.username = "vagrant"
-      override.ssh.private_key_path = ".vagrant/machines/fake_managed_server/virtualbox/private_key"
+      override.ssh.private_key_path = ".vagrant/machines/local_linux/virtualbox/private_key"
     end
 
-    ms_config.vm.provision :chef_solo do |chef|
+    ml_config.vm.provision :chef_solo do |chef|
       chef.cookbooks_path = [ './cookbooks' ]
       chef.add_recipe "apt"
       chef.add_recipe "apache2"
     end
   end
 
+
+
+  #
+  # fake a managed windows server by bringing up a virtualbox vm
+  #
+  config.vm.define :local_windows do |lw_config|
+    lw_config.vm.box = "boxcutter/eval-win7x86-enterprise"
+    lw_config.vm.network :private_network, ip: "192.168.40.36"
+    lw_config.berkshelf.enabled = false
+    lw_config.vm.synced_folder ".", "/vagrant", disabled: true
+  end
+
+  #
+  # configure managed provider to connect to `local_windows`
+  #
+  config.vm.define :managed_windows do |mw_config|
+
+    mw_config.vm.box = "tknerr/managed-server-dummy"
+
+    mw_config.berkshelf.enabled = false
+
+    mw_config.vm.communicator = :winrm
+    mw_config.winrm.username = 'vagrant'
+    mw_config.winrm.password = 'vagrant'
+
+    mw_config.vm.provider :managed do |managed, override|
+      managed.server = '192.168.40.36'
+    end
+  end
+
 end

data/lib/vagrant-managed-servers/action/sync_folders.rb

@@ -34,22 +34,6 @@ module VagrantPlugins
             hostpath  = File.expand_path(data[:hostpath], env[:root_path])
             guestpath = data[:guestpath]
 
-            # Windows doesn't support ssh or rsync natively. Use winrm instead
-            if (env[:machine].config.vm.communicator == :winrm) then
-              env[:ui].info(I18n.t('vagrant_managed_servers.winrm_upload',
-                                  :hostpath => hostpath,
-                                  :guestpath => guestpath))
-              env[:machine].communicate.tap do |comm|
-                # When syncing many files, we've see SEC_E_INVALID_TOKEN errors
-                # that appear to be transient (try again and it goes away). Let's
-                # retry a few times to add some robustness.
-                retryable(tries: 3, sleep: 1) do
-                  comm.upload(hostpath, guestpath)
-                end
-              end
-              next
-            end
-
             unless Vagrant::Util::Which.which('rsync')
               env[:ui].warn(I18n.t('vagrant_managed_servers.rsync_not_found_warning'))
               break

data/lib/vagrant-managed-servers/action.rb

@@ -26,21 +26,6 @@ module VagrantPlugins
 
             b2.use LinkServer
           end
-=begin
-          b.use HandleBoxUrl
-          b.use ConfigValidate
-          b.use Call, IsReachable do |env, b2|
-            if env[:result]
-              b2.use !MessageNotReachable
-              next
-            end
-
-            b2.use Provision
-            b2.use SyncFolders
-            b2.use WarnNetworks
-            b2.use LinkServer
-          end
-=end
         end
       end
 
@@ -77,7 +62,15 @@ module VagrantPlugins
               end
 
               b3.use Provision
-              b3.use SyncFolders
+              if env[:machine].config.vm.communicator == :winrm
+                # Use the builtin vagrant folder sync for Windows target servers.
+                # This gives us SMB folder sharing, which is much faster than the
+                # WinRM uploader for any non-trivial number of files.
+                b3.use Vagrant::Action::Builtin::SyncedFolders
+              else
+                # Vagrant managed servers custom implementation
+                b3.use SyncFolders
+              end
             end
           end
         end

data/lib/vagrant-managed-servers/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ManagedServers
-    VERSION = "0.6.2"
+    VERSION = "0.7.0"
   end
 end

data/vagrant-managed-servers.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant-managed-servers"
 
+  s.add_runtime_dependency "vagrant-winrm-syncedfolders"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec-core", "~> 2.14.7"
   s.add_development_dependency "rspec-expectations", "~> 2.14.5"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-managed-servers
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Torben Knerr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: vagrant-winrm-syncedfolders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement