Update Vagrantfile for Vagrant 1.7.4

UtahDave / salt-vagrant-demo

Demo of Salt in Vagrant. 1 master and 2 minions

Apache License 2.0

247 stars 191 forks source link

Update Vagrantfile for Vagrant 1.7.4 #9

Closed cjhenck closed 8 years ago

cjhenck commented 8 years ago

Patches to make the Vagrantfile work with 1.7.4 - includes the "-P" parameter, as well as manual copying of the configuration files

UtahDave commented 8 years ago

hey @cjhenck, There's a merge conflict, could you rebase this PR? I think it's because I merged another PR that adds the "-P" bootstrap option.

Thanks!

UtahDave commented 8 years ago

@cjhenck thanks for this pr. I think most of the issues you were targeting were addressed in other pull requests. I'm going to close this. Please feel free to comment here or open another pull request if I've missed anything important here.