jenkins-bot has submitted this change and it was merged.

Change subject: Support Parallels VM provider for Vagrant
......................................................................


Support Parallels VM provider for Vagrant

Enable with:

  $ vagrant up --provider=parallels

Requires plugins:

  * Parallels provider - http://parallels.github.io/vagrant-parallels/
    $ vagrant plugin install vagrant-parallels

  * Puppet installer - https://github.com/petems/vagrant-puppet-install
    $ vagrant plugin install vagrant-puppet-install

Note that port forwarding works via localhost but not via external interfaces
of the host machine by default.

Puppet version is pinned to 3.7.4 to avoid accidentally flipping over to
a future incompatible version. Note that 3.4.3 does not install via this
plugin on this distro...

Change-Id: Iaf91b73afffec963a847b9ccb35e5121d48a17ca
---
M Vagrantfile
A support/README-parallels.md
2 files changed, 47 insertions(+), 0 deletions(-)

Approvals:
  Dduvall: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Vagrantfile b/Vagrantfile
index 19c481d..a38dcfd 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -97,6 +97,25 @@
         override.vm.box = 'Wikimedia/trusty64-puppet-lxc'
     end
 
+    # Parallels provider. Enable with `--provider=parallels`
+    #
+    # Requires plugins:
+    #   * Parallels provider - http://parallels.github.io/vagrant-parallels/
+    #     $ vagrant plugin install vagrant-parallels
+    #   * Puppet installer - https://github.com/petems/vagrant-puppet-install
+    #     $ vagrant plugin install vagrant-puppet-install
+    #
+    # Note that port forwarding works via localhost but not via external 
interfaces
+    # of the host machine by default...
+    config.vm.provider :parallels do |parallels, override|
+        override.vm.box = 'parallels/ubuntu-14.04'
+
+        # Pin to a 3.x version, current as of this config writing.
+        config.puppet_install.puppet_version = '3.7.4'
+
+        override.vm.network :private_network, ip: settings[:static_ip]
+    end
+
     config.vm.network :forwarded_port,
         guest: 80, host: settings[:http_port], id: 'http'
 
diff --git a/support/README-parallels.md b/support/README-parallels.md
new file mode 100644
index 0000000..2510668
--- /dev/null
+++ b/support/README-parallels.md
@@ -0,0 +1,28 @@
+Using Parallels with MediaWiki-Vagrant
+======================================
+
+[Parallels Desktop][0] is a commercial virtualization application for OS X.
+
+Setup
+-----
+
+Support for Parallels with MW-Vagrant requires some additional plugins,
+[vagrant-parallels][1] which implements a `parallels` [provider][2], and
+[vagrant-puppet-install][3] which ensures Puppet is installed to the base
+Ubuntu image.
+
+    vagrant plugin install vagrant-parallels
+    vagrant plugin install vagrant-puppet-install
+
+Use
+---
+
+    vagrant up --provider=parallels
+
+Note that port forwarding works via localhost but not via external interfaces
+of the host machine by default.
+
+[0]: http://en.wikipedia.org/wiki/Parallels_Desktop_for_Mac
+[1]: http://parallels.github.io/vagrant-parallels/
+[2]: http://docs.vagrantup.com/v2/providers/
+[3]: https://github.com/petems/vagrant-puppet-install

-- 
To view, visit https://gerrit.wikimedia.org/r/198280
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf91b73afffec963a847b9ccb35e5121d48a17ca
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to