Skip to content

Commit

Permalink
Release v1.7.6
Browse files Browse the repository at this point in the history
* master:
  Bump version to v1.7.6
  Update known issues in README.md
  box_register: Read box path right before opening config.pvs
  fix link to vagrant downloads page
  Add a note about the known issue with Vagrant v1.9.5
  • Loading branch information
legal90 committed Jul 31, 2017
2 parents 1bedb51 + 083d272 commit 096ceba
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ 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 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**
Expand Down
6 changes: 3 additions & 3 deletions lib/vagrant-parallels/action/box_register.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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]}")
Expand Down
2 changes: 1 addition & 1 deletion lib/vagrant-parallels/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module VagrantPlugins
module Parallels
VERSION = '1.7.5'
VERSION = '1.7.6'
end
end
5 changes: 3 additions & 2 deletions website/docs/source/docs/installation/index.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

<div class="alert alert-warn">
Expand Down

0 comments on commit 096ceba

Please sign in to comment.