Merge commit '08808a37f01122d9a00cb6be8a6610dfd8abfec7' into theand1404

* commit '08808a37f01122d9a00cb6be8a6610dfd8abfec7': potential fix for fideloper#438, telling DO to get user "vagrant" created on provision
theand · Mar 12, 2015 · dab5943 · dab5943
2 parents 6baf6e3 + 08808a3
commit dab5943
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -176,6 +176,7 @@ Vagrant.configure("2") do |config|
   # Needs to ensure that the vagrant plugin is installed
   config.vm.provider :digital_ocean do |provider, override|
     override.ssh.private_key_path = '~/.ssh/id_rsa'
+    override.ssh.username = 'vagrant'
     override.vm.box = 'digital_ocean'
     override.vm.box_url = "https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box"