From 109108443817f8c6d1a68228a87dd2e1587cc7ae Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Fri, 10 Aug 2018 11:56:29 +0200 Subject: [PATCH] Update vagrant setup to stretch64 with LXC --- Vagrantfile | 9 ++------- salt/bootstrap.sh | 4 +--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 4a99c82..64decd5 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,21 +2,16 @@ # vi: set ft=ruby : Vagrant.configure(2) do |config| - config.vm.box = "debian/contrib-jessie64" + config.vm.box = "debian/stretch64" config.vm.hostname = "gvaldap.local" - config.vm.network "private_network", ip: "172.16.3.3" + config.vm.network "private_network", ip: "172.16.3.3", lxc__bridge_name: 'vlxcbr1' config.vm.network "forwarded_port", guest: 8000, host: 8001 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 = "512" - end - config.vm.provision :salt do |salt| salt.bootstrap_script = "salt/bootstrap.sh" salt.minion_id = "gvaldap" diff --git a/salt/bootstrap.sh b/salt/bootstrap.sh index b87fc55..faeed2e 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