BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347302 )
Change subject: lxc: new box image
......................................................................
lxc: new box image
Our custom box image is throwing a 404, so backport the Puppet bootstrap
provisioner and switch to a known good box image.
Bug: T161891
Change-Id: Idec261cbc334b5a9a7293ec4445f67969387c019
---
M Vagrantfile
A support/puppet-bootstrap.sh
2 files changed, 24 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/02/347302/1
diff --git a/Vagrantfile b/Vagrantfile
index ee403cf..3c40ca1 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -90,7 +90,7 @@
# LXC provider. Enable wtih `--provider=lxc`
# Requires vagrant-lxc plugin and Vagrant 1.7+
config.vm.provider :lxc do |_lxc, override|
- override.vm.box = 'Wikimedia/trusty64-puppet-lxc'
+ override.vm.box = 'fgrehm/trusty64-lxc'
end
# Parallels provider. Enable with `--provider=parallels`
@@ -212,6 +212,9 @@
config.vm.provision :mediawiki_reload if mwv.reload?
+ # Ensure that the VM has Puppet installed
+ config.vm.provision :shell, path: 'support/puppet-bootstrap.sh'
+
config.vm.provision :puppet do |puppet|
# Use empty module path to avoid an extra mount.
# See --modulepath below
diff --git a/support/puppet-bootstrap.sh b/support/puppet-bootstrap.sh
new file mode 100755
index 0000000..cf64fff
--- /dev/null
+++ b/support/puppet-bootstrap.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Install Puppet via apt
+set -e
+
+if [ "`id -u`" != "0" ]; then
+ echo "This script must be run as root." >&2
+ echo "EUID = $EUID" >&2
+ exit 1
+fi
+
+if which puppet >/dev/null 2>&1; then
+ exit 0
+fi
+
+apt-get update >/dev/null 2>&1
+DEBIAN_FRONTEND=noninteractive apt-get \
+ -y \
+ -o Dpkg::Options::="--force-confdef" \
+ -o Dpkg::Options::="--force-confold" \
+ install puppet >/dev/null 2>&1
--
To view, visit https://gerrit.wikimedia.org/r/347302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idec261cbc334b5a9a7293ec4445f67969387c019
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: trusty-compat
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
