Merge pull request #444 from MSeven/master

refactor(vagrant): switch image

.gitignore

@@ -120,3 +120,7 @@ docs/*.md
 Dockerfile.*_*
 ignore/
 tmp/
+
+#Vagrant Specific files
+.vagrant
+top.sls

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'
 

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