Improve Vagrant setup

Use debian/contrib-jessie64 base box, install python-cryptography before
saltstack bootstrap.
This commit is contained in:
Jan Dittberner 2016-09-25 01:10:17 +02:00
parent 88d8a29a14
commit 8d14826169
2 changed files with 10 additions and 2 deletions

5
Vagrantfile vendored
View file

@ -2,11 +2,14 @@
# vi: set ft=ruby : # vi: set ft=ruby :
Vagrant.configure(2) do |config| Vagrant.configure(2) do |config|
config.vm.box = "debian/jessie64" config.vm.box = "debian/contrib-jessie64"
config.vm.hostname = "gvafile.local" config.vm.hostname = "gvafile.local"
config.vm.network "private_network", ip: "172.16.3.4" config.vm.network "private_network", ip: "172.16.3.4"
config.vm.synced_folder "../gvasalt/states/", "/srv/salt/" config.vm.synced_folder "../gvasalt/states/", "/srv/salt/"
config.vm.synced_folder "../gvasalt/pillar/", "/srv/pillar/" config.vm.synced_folder "../gvasalt/pillar/", "/srv/pillar/"
config.vm.provider "virtualbox" do |vb| config.vm.provider "virtualbox" do |vb|
# vb.gui = true # vb.gui = true
vb.memory = "512" vb.memory = "512"

View file

@ -1,5 +1,10 @@
#!/bin/sh - #!/bin/sh -
echo "deb http://httpredir.debian.org/debian jessie-backports main" >/etc/apt/sources.list.d/backports.list
apt-get update
apt-get install -y -t jessie-backports python-cryptography
# We just download the bootstrap script by default and execute that. # We just download the bootstrap script by default and execute that.
if [ -x /usr/bin/fetch ]; then if [ -x /usr/bin/fetch ]; then
/usr/bin/fetch -o - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@" /usr/bin/fetch -o - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@"