diff --git a/Vagrantfile b/Vagrantfile index ac15e99..63b11ce 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,10 +2,10 @@ # vi: set ft=ruby : Vagrant.configure(2) do |config| - config.vm.box = "debian/contrib-jessie64" + config.vm.box = "debian/stretch64" config.vm.hostname = "gva.local" - config.vm.network "private_network", ip: "172.16.3.2" + config.vm.network "private_network", ip: "172.16.3.2", lxc__bridge_name: 'vlxcbr1' config.vm.network "forwarded_port", guest: 443, host: 8443 config.vm.network "forwarded_port", guest: 8000, host: 8000 @@ -14,11 +14,6 @@ Vagrant.configure(2) do |config| config.vm.synced_folder "../gvasalt/states/", "/srv/salt/" config.vm.synced_folder "../gvasalt/pillar/", "/srv/pillar/" - config.vm.provider "virtualbox" do |vb| - # vb.gui = true - vb.memory = "1024" - end - config.vm.provision :salt do |salt| salt.bootstrap_script = "salt/bootstrap.sh" salt.minion_id = "gva.local" diff --git a/salt/bootstrap.sh b/salt/bootstrap.sh index 6e8835e..7479d80 100755 --- a/salt/bootstrap.sh +++ b/salt/bootstrap.sh @@ -1,9 +1,7 @@ #!/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 +apt-get install -y python-cryptography # We just download the bootstrap script by default and execute that. if [ -x /usr/bin/fetch ]; then