Merge pull request #147 from oxyc/patch-1

PR #147: Allow Vagrantfile to be loaded from scripts in other directories.
geerlingguy · Jul 3, 2015 · 3d5b33b · 3d5b33b
2 parents 7156dda + 7e87005
commit 3d5b33b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -46,13 +46,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  if is_windows
  # Provisioning configuration for shell script (for Windows).
  config.vm.provision "shell" do |sh|
- sh.path = "provisioning/JJG-Ansible-Windows/windows.sh"
- sh.args = "provisioning/playbook.yml"
+ sh.path = "#{dir}/provisioning/JJG-Ansible-Windows/windows.sh"
+ sh.args = "#{dir}/provisioning/playbook.yml"
  end
  else
  # Provisioning configuration for Ansible (for Mac/Linux hosts).
  config.vm.provision "ansible" do |ansible|
- ansible.playbook = "provisioning/playbook.yml"
+ ansible.playbook = "#{dir}/provisioning/playbook.yml"
  ansible.sudo = true
  end
  end