jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405209 )
Change subject: Support LXC in Vagrantfile
......................................................................
Support LXC in Vagrantfile
LXC, from a linux host, can be significantly more responsive
than virtualbox. Support it in the Vagrantfile.
Change-Id: I2b1e2d41beea97dd216c8c75395735a472104208
---
M Vagrantfile
M bootstrap-vm.sh
2 files changed, 15 insertions(+), 9 deletions(-)
Approvals:
jenkins-bot: Verified
DCausse: Looks good to me, approved
diff --git a/Vagrantfile b/Vagrantfile
index d8d71ad..1005dca 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,18 +1,23 @@
Vagrant.configure("2") do |config|
+ config.vm.provider :lxc do |_lxc, override|
+ override.vm.box = 'LEAP/jessie'
+ end
+
config.vm.provider :virtualbox do |vb, override|
override.vm.box = 'debian/contrib-jessie64'
vb.customize ['modifyvm', :id, '--memory', '2048']
+
+ root_share_options = { id: 'vagrant-root' }
+ root_share_options[:type] = :nfs
+ root_share_options[:mount_options] = ['noatime', 'rsize=32767',
'wsize=3267', 'async', 'nolock']
+ override.nfs.map_uid = Process.uid
+ override.nfs.map_gid = Process.gid
+ override.vm.synced_folder ".", "/vagrant", root_share_options
+
+ override.vm.hostname = "MjoLniR"
+ override.vm.network "private_network", type: "dhcp"
end
- root_share_options = { id: 'vagrant-root' }
- root_share_options[:type] = :nfs
- root_share_options[:mount_options] = ['noatime', 'rsize=32767',
'wsize=3267', 'async', 'nolock']
- config.nfs.map_uid = Process.uid
- config.nfs.map_gid = Process.gid
- config.vm.synced_folder ".", "/vagrant", root_share_options
-
- config.vm.hostname = "MjoLniR"
- config.vm.network "private_network", type: "dhcp"
config.vm.provision "shell", path: "bootstrap-vm.sh"
end
diff --git a/bootstrap-vm.sh b/bootstrap-vm.sh
index 4d3851f..7416258 100644
--- a/bootstrap-vm.sh
+++ b/bootstrap-vm.sh
@@ -2,6 +2,7 @@
set -e
+apt update
apt install -q -y software-properties-common
# Confluent is needed for installing kafka, which requires zookeeper and some
other stuff
# This intentionally uses an older version to get kafka 0.9, to match
production
--
To view, visit https://gerrit.wikimedia.org/r/405209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b1e2d41beea97dd216c8c75395735a472104208
Gerrit-PatchSet: 2
Gerrit-Project: search/MjoLniR
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
