From 78048d88b2e358a7dda57d21a2d32f071e8df733 Mon Sep 17 00:00:00 2001 From: Martin Griesbach Date: Wed, 11 Dec 2019 19:03:35 +0100 Subject: [PATCH] Vagrant Updates: * add Vagrant temp files to .gitignore * Update Vagrant Basebox to bento/ubuntu-18.04 (bento images deliver better Vagrant integration) * Update Vagrant setup-salt.sh to use the current salt bootstrap script. --- .gitignore | 4 ++++ Vagrantfile | 2 +- dev/setup-salt.sh | 7 +++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0bbb03c..e71a695 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,7 @@ docs/*.md Dockerfile.*_* ignore/ tmp/ + +#Vagrant Specific files +.vagrant +top.sls \ No newline at end of file diff --git a/Vagrantfile b/Vagrantfile index cd22054..e2a2fa6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -7,7 +7,7 @@ VAGRANTFILE_API_VERSION = '2' Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box = 'ubuntu/trusty64' + config.vm.box = 'bento/ubuntu-18.04' config.vm.hostname = 'salt' config.vm.synced_folder './', '/srv/salt', id: 'vagrant-root' diff --git a/dev/setup-salt.sh b/dev/setup-salt.sh index 6a30b6d..82e3025 100644 --- a/dev/setup-salt.sh +++ b/dev/setup-salt.sh @@ -1,8 +1,7 @@ #!/bin/sh -# use the latest stable Salt from repo.saltstack.com -wget -O - https://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add - -echo 'deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest trusty main' | sudo tee /etc/apt/sources.list.d/saltstack.list +curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com +sudo sh bootstrap-salt.sh stable sudo apt-get update -y sudo apt-get install salt-master -y @@ -13,6 +12,6 @@ sudo ln -s /srv/salt/pillar.example /srv/pillar/salt.sls sudo ln -s /srv/salt/dev/pillar_top.sls /srv/pillar/top.sls # this file will be copied to make a running config. it should not be checked in. sudo cp /srv/salt/dev/state_top.sls /srv/salt/top.sls -# Accept all keys# sleep 15 #give the minion a few seconds to register +# Accept all keys# sudo salt-key -y -A