From 0d352b98bcba18085e839895f103f0c12580b517 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Sat, 27 May 2017 17:34:28 +0200 Subject: [PATCH 1/5] Add a note about the known issue with Vagrant v1.9.5 --- README.md | 4 +++- website/docs/source/docs/installation/index.html.md | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1bae583e..fde77886 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,9 @@ allowing to manage [Parallels Desktop](http://www.parallels.com/products/desktop virtual machines on OS X hosts. ### Requirements -- [Vagrant v1.8](http://www.vagrantup.com) or higher +- [Vagrant v1.8](http://www.vagrantup.com) or higher +(_there is a known issue with Vagrant v1.9.5: + [GH-297](https://github.com/Parallels/vagrant-parallels/issues/297#issuecomment-304458691)_) - [Parallels Desktop 10 for Mac](http://www.parallels.com/products/desktop/) or higher *Note:* Only **Pro** and **Business** editions of **Parallels Desktop for Mac** diff --git a/website/docs/source/docs/installation/index.html.md b/website/docs/source/docs/installation/index.html.md index 5a312fb1..cb8cd8a5 100755 --- a/website/docs/source/docs/installation/index.html.md +++ b/website/docs/source/docs/installation/index.html.md @@ -18,7 +18,8 @@ The Vagrant plugin installer will automatically download and install `vagrant-parallels` plugin. ## Requirements -- Vagrant v1.8 or higher +- Vagrant v1.8 or higher (_there is a known issue with Vagrant v1.9.5: +[GH-297](https://github.com/Parallels/vagrant-parallels/issues/297#issuecomment-304458691)_) - Parallels Desktop for Mac version 10 or higher
From d8f6cb2775b31c831ad4e42b4a4c9071911815d0 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Tue, 6 Jun 2017 23:59:16 -0500 Subject: [PATCH 2/5] fix link to vagrant downloads page --- website/docs/source/docs/installation/index.html.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/source/docs/installation/index.html.md b/website/docs/source/docs/installation/index.html.md index cb8cd8a5..598d8ce5 100755 --- a/website/docs/source/docs/installation/index.html.md +++ b/website/docs/source/docs/installation/index.html.md @@ -5,7 +5,7 @@ sidebar_current: "installation" # Installing Provider First, make sure that you have [Parallels Desktop for Mac](http://www.parallels.com/products/desktop/) -and [Vagrant](http://www.vagrantup.com/downloads) properly installed. +and [Vagrant](http://www.vagrantup.com/downloads.html) properly installed. We recommend that you to use the latest versions of these products. Since the Parallels provider is a Vagrant plugin, installing it is easy: From b6bcc20a35f184fb46d61dd9b8939eb7c1bcfe23 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Tue, 25 Jul 2017 21:24:23 +0200 Subject: [PATCH 3/5] box_register: Read box path right before opening config.pvs The name of box VM, as well as *.pvm dir name, will be changed by Parallels Desktop automatically if there is already any VM registered with the same name. So, we should read the actual box path before trying to access its content. --- lib/vagrant-parallels/action/box_register.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/vagrant-parallels/action/box_register.rb b/lib/vagrant-parallels/action/box_register.rb index f2e71ed5..16df1642 100644 --- a/lib/vagrant-parallels/action/box_register.rb +++ b/lib/vagrant-parallels/action/box_register.rb @@ -48,9 +48,9 @@ def box_path(env) pvm end - def box_id(env, box_path) + def box_id(env) # Get the box image UUID from XML-based configuration file - tpl_config = File.join(box_path, 'config.pvs') + tpl_config = File.join(box_path(env), 'config.pvs') xml = Nokogiri::XML(File.open(tpl_config)) id = xml.xpath('//ParallelsVirtualMachine/Identification/VmUuid').text @@ -110,7 +110,7 @@ def register_box(env) # Register the box VM image env[:machine].provider.driver.register(pvm, options) - env[:clone_id] = box_id(env, pvm) + env[:clone_id] = box_id(env) @logger.info( "Registered box #{env[:machine].box.name} with id #{env[:clone_id]}") From 53db13da5385461619f404ae561d928c419ca274 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Mon, 31 Jul 2017 09:52:17 +0200 Subject: [PATCH 4/5] Update known issues in README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fde77886..f85ae564 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,9 @@ virtual machines on OS X hosts. ### Requirements - [Vagrant v1.8](http://www.vagrantup.com) or higher -(_there is a known issue with Vagrant v1.9.5: - [GH-297](https://github.com/Parallels/vagrant-parallels/issues/297#issuecomment-304458691)_) +(_there are known issues with Vagrant v1.9.5 +[[GH-297](https://github.com/Parallels/vagrant-parallels/issues/297#issuecomment-304458691)] +and v1.9.6 [[GH-301]](https://github.com/Parallels/vagrant-parallels/issues/301)_) - [Parallels Desktop 10 for Mac](http://www.parallels.com/products/desktop/) or higher *Note:* Only **Pro** and **Business** editions of **Parallels Desktop for Mac** From 083d272a86dc011c89f44b51c2173325cef48221 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Mon, 31 Jul 2017 09:53:04 +0200 Subject: [PATCH 5/5] Bump version to v1.7.6 --- lib/vagrant-parallels/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vagrant-parallels/version.rb b/lib/vagrant-parallels/version.rb index 231f10e7..66570535 100644 --- a/lib/vagrant-parallels/version.rb +++ b/lib/vagrant-parallels/version.rb @@ -1,5 +1,5 @@ module VagrantPlugins module Parallels - VERSION = '1.7.5' + VERSION = '1.7.6' end end