jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/335397 )

Change subject: Parallels base image
......................................................................


Parallels base image

bug: T154295
Change-Id: I960eb0293e21d73697f1eaa72ee8f9b3a3cf24f0
---
M Vagrantfile
1 file changed, 6 insertions(+), 12 deletions(-)

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



diff --git a/Vagrantfile b/Vagrantfile
index 3c2748a..773bfc9 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -89,19 +89,13 @@
   # 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.
-  #   override.puppet_install.puppet_version = '3.7.4'
-
-  #   override.vm.network :private_network, ip: settings[:static_ip]
-  # end
+  # 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 = 'boxcutter/debian8'
+    override.vm.network :private_network, ip: settings[:static_ip]
+  end
 
   # libvirt (KVM/QEMU) provider.  Enable with `--provider=libvirt`.
   # config.vm.provider :libvirt do |_libvirt, override|

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I960eb0293e21d73697f1eaa72ee8f9b3a3cf24f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to