Vagrant 1.7.5 fix
Change-Id: I5f9d2d7f9e86662a62b1d8d331dc8c211f7e0848
This commit is contained in:
parent
7e4898ef5f
commit
35c3c9cc46
|
@ -72,7 +72,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
|||
## Use all the defaults:
|
||||
config.vm.provision :salt do |salt|
|
||||
|
||||
salt.minion_config = "salt_minion"
|
||||
#salt.minion_config = "salt_minion"
|
||||
salt.colorize = true
|
||||
salt.log_level = "all"
|
||||
salt.bootstrap_options = "-P"
|
||||
|
@ -80,4 +80,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
|||
|
||||
end
|
||||
|
||||
# Fix for Vagrant 1.7.5: https://github.com/mitchellh/vagrant/issues/5973
|
||||
# Solution from https://github.com/mitchellh/vagrant/issues/5973#issuecomment-126102092
|
||||
# After Vagrant is fixed, this can be removed and the line
|
||||
# salt.minion_config = "salt_minion"
|
||||
# uncommented above
|
||||
config.vm.provision "shell",
|
||||
inline: "sudo cp /etc/salt/minion{,-dist} && sudo cp /vagrant/salt_minion /etc/salt/minion"
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue