Browse Source

Merge pull request #181 from jplock/jp-vagrant-cleanup

This now works fine in Vagrant 1.4.3, remove the workaround
Luke Cyca 10 years ago
parent
commit
f7b9884f38
1 changed files with 1 additions and 4 deletions
  1. 1
    4
      Vagrantfile

+ 1
- 4
Vagrantfile View File

23
   config.vm.provision :ansible do |ansible|
23
   config.vm.provision :ansible do |ansible|
24
     ansible.playbook = 'site.yml'
24
     ansible.playbook = 'site.yml'
25
     ansible.host_key_checking = false
25
     ansible.host_key_checking = false
26
+    ansible.extra_vars = { ansible_ssh_user: 'vagrant', testing: true }
26
 
27
 
27
     # ansible.tags = ['blog']
28
     # ansible.tags = ['blog']
28
     # ansible.skip_tags = ['openvpn']
29
     # ansible.skip_tags = ['openvpn']
29
     # ansible.verbose = 'vvvv'
30
     # ansible.verbose = 'vvvv'
30
-
31
-    # Workaround: https://github.com/mitchellh/vagrant/issues/2174
32
-    extra_vars = { ansible_ssh_user: 'vagrant', testing: true}
33
-    ansible.raw_arguments = "--extra-vars=" + extra_vars.map { |k,v| "#{k}=#{v}" }.join(" ")
34
   end
31
   end
35
 
32
 
36
 end
33
 end

Loading…
Cancel
Save