From 2a2b77999691373a65d50676e104b4ada899e5b7 Mon Sep 17 00:00:00 2001 From: Nick Charlton Date: Thu, 23 Apr 2020 18:23:25 +0100 Subject: [PATCH 1/2] Rename VMware Fusion support to VMware Desktop On 2016-03-26, HashiCorp released the VMware Desktop Plugin, which replaced the existing VMware Fusion implementation. With the rename, the hooks that Landrush needs to start services can no longer be called. Renaming those makes those work again. Fixes #334. --- lib/landrush/action/common.rb | 4 ++-- lib/landrush/plugin.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/landrush/action/common.rb b/lib/landrush/action/common.rb index f6d920e..f372b9d 100644 --- a/lib/landrush/action/common.rb +++ b/lib/landrush/action/common.rb @@ -5,7 +5,7 @@ module Common SUPPORTED_PROVIDERS = { 'VagrantPlugins::ProviderVirtualBox::Provider' => :virtualbox, 'VagrantPlugins::ProviderLibvirt::Provider' => :libvirt, - 'HashiCorp::VagrantVMwarefusion::Provider' => :vmware_fusion, + 'HashiCorp::VagrantVMwareDesktop::Provider' => :vmware_desktop, 'VagrantPlugins::Parallels::Provider' => :parallels, 'VagrantPlugins::HyperV::Provider' => :hyperv, 'VagrantPlugins::DockerProvider::Provider' => :docker, @@ -34,7 +34,7 @@ def libvirt? end def vmware? - provider == :vmware_fusion + provider == :vmware_desktop end def parallels? diff --git a/lib/landrush/plugin.rb b/lib/landrush/plugin.rb index 10a6d37..c12a915 100644 --- a/lib/landrush/plugin.rb +++ b/lib/landrush/plugin.rb @@ -33,9 +33,9 @@ class Plugin < Vagrant.plugin('2') end # Hooks for VMWarefusion provider - if defined?(HashiCorp::VagrantVMwarefusion) - hook.before(HashiCorp::VagrantVMwarefusion::Action::Network, pre_boot_actions) - hook.after(HashiCorp::VagrantVMwarefusion::Action::WaitForCommunicator, post_boot_actions) + if defined?(HashiCorp::VagrantVMwareDesktop) + hook.before(HashiCorp::VagrantVMwareDesktop::Action::Network, pre_boot_actions) + hook.after(HashiCorp::VagrantVMwareDesktop::Action::WaitForCommunicator, post_boot_actions) end # Hooks for Parallels provider From abfbd1d73e0a5c899921f63dce0fcc859bf0a794 Mon Sep 17 00:00:00 2001 From: Nick Charlton Date: Fri, 22 May 2020 18:21:19 +0100 Subject: [PATCH 2/2] Document that we need the VMWare Desktop plugin This attempts to document the need for the new plugin model, which should be enough to prompt anyone upgrading to know that they need it. https://www.hashicorp.com/blog/introducing-the-vagrant-vmware-desktop-plugin/ --- README.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.adoc b/README.adoc index 2ea8b99..1bc5667 100644 --- a/README.adoc +++ b/README.adoc @@ -32,6 +32,9 @@ Install under Vagrant (1.1 or later): $ vagrant plugin install landrush .... +If you're using the VMware provider, you'll need the +link:https://www.vagrantup.com/vmware/index.html[Vagrant VMWare Desktop plugin]. + == Getting started . Enable the plugin in your `Vagrantfile`: