From 7d397840c86bc8edcdd45050c9abd944ac010e85 Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 3 Dec 2019 17:51:56 +0100
Subject: [PATCH] First step to make Vagrantfile work with Debian Buster 64
---
Vagrantfile | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/Vagrantfile b/Vagrantfile
index a894335..5a74c6a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,8 +2,8 @@
# vi: set ft=ruby :
Vagrant.configure(2) do |config|
- # lets us debian jessie amd64 as base.
- config.vm.box = "debian/jessie64"
+ # lets us debian buster amd64 as base.
+ config.vm.box = "debian/buster64"
# sync working dir; ignore folders that were created by node and grunt
config.vm.synced_folder ".", "/vagrant", type: "rsync",
@@ -11,28 +11,26 @@ Vagrant.configure(2) do |config|
# install those to be able to use gitfs for node formula
config.vm.provision :shell, :inline => "sudo apt-get -y install git-core"
- config.vm.provision :shell, :inline => "sudo apt-get -y install python-setuptools"
- config.vm.provision :shell, :inline => "sudo easy_install GitPython"
+ config.vm.provision :shell, :inline => "sudo apt-get -y install python3-setuptools"
+# Don't install GitPython, we should not need it on debian buster
+# config.vm.provision :shell, :inline => "sudo easy_install GitPython"
config.vm.provision :shell, :inline => "ln -s /vagrant/.saltstack/salt /srv/"
config.vm.provision :shell, :inline => "ln -s /vagrant/.saltstack/pillar /srv/"
-
config.vm.provision :salt do |salt|
# Workaround for:
# Copying salt minion config to /etc/salt
# Failed to upload a file to the guest VM via SCP due to a permissions
# error. [...]; @see:
# https://github.com/mitchellh/vagrant/issues/5973#issuecomment-137276605
- salt.bootstrap_options = '-F -c /tmp/ -P'
+ # JPT: Added -x python3, so this actually grabs existing repo urls.
+ salt.bootstrap_options = '-F -c /tmp/ -P -x python3'
salt.masterless = true
salt.minion_config = ".saltstack/minion"
salt.run_highstate = true
salt.verbose = true
end
-
-
-
# forward some service port from guest to host for testing?!
# config.vm.network "forwarded_port", guest:80, host:8888, host_ip:"localhost"
end
--
GitLab