Skip to content

Commit

Permalink
Fix Vagrantfile
Browse files Browse the repository at this point in the history
  • Loading branch information
amontalban committed Jan 26, 2017
1 parent 7fd2cf9 commit 8627edc
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,23 @@ test -d /srv/pillar || mkdir /srv/pillar
test -f /tmp/travis/top.sls && cp /{tmp/travis,srv/salt}/top.sls
cp {/tmp/travis,/srv/salt}/top.sls
cp /tmp/travis/top_pillar.sls /srv/pillar/top.sls
cp /srv/{salt/pillar.example,pillar/monit.sls}
ln -s /srv/salt/pillar.example /srv/pillar/monit.sls
SCRIPT

Vagrant.configure(2) do |config|
config.vm.define "xenial" do |xenial|
xenial.vm.box = "xenial"
config.vm.provider 'virtualbox' do |v|
v.linked_clone = true if Vagrant::VERSION =~ /^1.8/
end

config.vm.define "monit" do |monit|
monit.vm.box = "ubuntu/xenial64"

xenial.vm.synced_folder ".", "/vagrant", disabled: true
xenial.vm.synced_folder ".", "/srv/salt"
xenial.vm.synced_folder ".travis", "/tmp/travis"
monit.vm.synced_folder ".", "/vagrant", disabled: true
monit.vm.synced_folder ".", "/srv/salt"
monit.vm.synced_folder ".travis", "/tmp/travis"

xenial.vm.provision "shell", inline: $script
xenial.vm.provision :salt do |salt|
salt.bootstrap_script = "../salt-bootstrap/bootstrap-salt.sh"
monit.vm.provision "shell", inline: $script
monit.vm.provision :salt do |salt|
salt.masterless = true
salt.minion_config = ".travis/minion"
salt.run_highstate = false
Expand Down

0 comments on commit 8627edc

Please sign in to comment.