Skip to content

Commit

Permalink
Vagrant Salt - crafted Vagrantfiles to work around issues #6011 & #6029.
Browse files Browse the repository at this point in the history
  • Loading branch information
Joaquin Menchaca committed Aug 12, 2015
1 parent fad2a5e commit 745b177
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion configbox/vagrant/salt/vagrants/centos6/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provision :salt do |salt|
salt.run_highstate = true
salt.minion_config = "../../provisioning/minion"
salt.bootstrap_options = "-F -c /tmp"
salt.bootstrap_options = "-F -c /tmp" # Vagrant Issue #6029
salt.verbose = true
end
end
6 changes: 5 additions & 1 deletion configbox/vagrant/salt/vagrants/precise/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provision :salt do |salt|
salt.run_highstate = true
salt.minion_config = "../../provisioning/minion"
salt.bootstrap_options = "-F -c /tmp" # Vagrant Issue #6029
# salt.bootstrap_options = "-F -c /temp -P"
salt.bootstrap_options = "-F -c /tmp -P" # Vagrant Issues #6011 & #6029
salt.verbose = true
end
end


# PURE -F -c /temp = FAIL IN Ubuntu Precise
5 changes: 1 addition & 4 deletions configbox/vagrant/salt/vagrants/wheezy/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

config.vm.synced_folder "../../provisioning/salt", "/srv/salt/"

config.ssh.username = "root"
config.ssh.password = "vagrant"

# Provision System
config.vm.provision :salt do |salt|
salt.run_highstate = true
salt.minion_config = "../../provisioning/minion"
salt.bootstrap_options = "-F -c /tmp"
salt.bootstrap_options = "-F -c /tmp" # Vagrant Issue #6029
salt.verbose = true
end
end

0 comments on commit 745b177

Please sign in to comment.