Skip to content
Snippets Groups Projects
Commit 28d5425b authored by Jan Philipp Timme's avatar Jan Philipp Timme
Browse files

Make gitfs work with python3, document Vagrantfile a bit

parent 7d397840
No related branches found
No related tags found
No related merge requests found
...@@ -2,11 +2,11 @@ state_verbose: True ...@@ -2,11 +2,11 @@ state_verbose: True
file_client: local file_client: local
gitfs_provider: gitpython gitfs_provider: pygit2
fileserver_backend: fileserver_backend:
- roots - roots
- git - gitfs
# Use this if you wanne use gitfs formulas! # Use this if you wanne use gitfs formulas!
#gitfs_remotes: #gitfs_remotes:
......
...@@ -2,28 +2,30 @@ ...@@ -2,28 +2,30 @@
# vi: set ft=ruby : # vi: set ft=ruby :
Vagrant.configure(2) do |config| Vagrant.configure(2) do |config|
# lets us debian buster amd64 as base. # Lets us debian buster amd64 as base.
config.vm.box = "debian/buster64" config.vm.box = "debian/buster64"
# sync working dir; ignore folders that were created by node and grunt # Sync working dir; ignore folders that were created by node and grunt
config.vm.synced_folder ".", "/vagrant", type: "rsync", config.vm.synced_folder ".", "/vagrant", type: "rsync",
rsync__exclude: [".git/",] rsync__exclude: [".git/",]
# install those to be able to use gitfs for node formula # Install those to be able to use gitfs
config.vm.provision :shell, :inline => "sudo apt-get -y install git-core" config.vm.provision :shell, :inline => "sudo apt-get -y install git-core python3-pygit2"
config.vm.provision :shell, :inline => "sudo apt-get -y install python3-setuptools" 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" # Symlink states + pillar to /srv
config.vm.provision :shell, :inline => "ln -s /vagrant/.saltstack/salt /srv/" 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 :shell, :inline => "ln -s /vagrant/.saltstack/pillar /srv/"
# Use vagrant salt provisioner (uses most recent salt-bootstrap script)
# See https://www.vagrantup.com/docs/provisioning/salt.html
config.vm.provision :salt do |salt| config.vm.provision :salt do |salt|
# Workaround for: # Workaround for:
# Copying salt minion config to /etc/salt # Copying salt minion config to /etc/salt
# Failed to upload a file to the guest VM via SCP due to a permissions # Failed to upload a file to the guest VM via SCP due to a permissions
# error. [...]; @see: # error. [...]; @see:
# https://github.com/mitchellh/vagrant/issues/5973#issuecomment-137276605 # https://github.com/mitchellh/vagrant/issues/5973#issuecomment-137276605
# JPT: Added -x python3, so this actually grabs existing repo urls. # JPT: Also use "-x python3", so repo urls actually grab python3 for debian 10
salt.bootstrap_options = '-F -c /tmp/ -P -x python3' salt.bootstrap_options = '-F -c /tmp/ -P -x python3'
salt.masterless = true salt.masterless = true
salt.minion_config = ".saltstack/minion" salt.minion_config = ".saltstack/minion"
...@@ -31,6 +33,6 @@ Vagrant.configure(2) do |config| ...@@ -31,6 +33,6 @@ Vagrant.configure(2) do |config|
salt.verbose = true salt.verbose = true
end end
# forward some service port from guest to host for testing?! # Forward some service port from guest to host for testing?! not needed yet
# config.vm.network "forwarded_port", guest:80, host:8888, host_ip:"localhost" # config.vm.network "forwarded_port", guest:80, host:8888, host_ip:"localhost"
end end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment