Browse Source

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.
tags/v1.0.0
Martin Griesbach 5 years ago
parent
commit
78048d88b2
3 changed files with 8 additions and 5 deletions
  1. +4
    -0
      .gitignore
  2. +1
    -1
      Vagrantfile
  3. +3
    -4
      dev/setup-salt.sh

+ 4
- 0
.gitignore View File

Dockerfile.*_* Dockerfile.*_*
ignore/ ignore/
tmp/ tmp/

#Vagrant Specific files
.vagrant
top.sls

+ 1
- 1
Vagrantfile View File

VAGRANTFILE_API_VERSION = '2' VAGRANTFILE_API_VERSION = '2'


Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| 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.hostname = 'salt'
config.vm.synced_folder './', '/srv/salt', id: 'vagrant-root' config.vm.synced_folder './', '/srv/salt', id: 'vagrant-root'



+ 3
- 4
dev/setup-salt.sh View File

#!/bin/sh #!/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 update -y
sudo apt-get install salt-master -y sudo apt-get install salt-master -y
sudo ln -s /srv/salt/dev/pillar_top.sls /srv/pillar/top.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. # 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 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 sleep 15 #give the minion a few seconds to register
# Accept all keys#
sudo salt-key -y -A sudo salt-key -y -A

Loading…
Cancel
Save