浏览代码

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

This now works fine in Vagrant 1.4.3, remove the workaround
Luke Cyca 10 年前
父节点
当前提交
f7b9884f38
共有 1 个文件被更改,包括 1 次插入4 次删除
  1. 1
    4
      Vagrantfile

+ 1
- 4
Vagrantfile 查看文件

@@ -23,14 +23,11 @@ Vagrant.configure('2') do |config|
23 23
   config.vm.provision :ansible do |ansible|
24 24
     ansible.playbook = 'site.yml'
25 25
     ansible.host_key_checking = false
26
+    ansible.extra_vars = { ansible_ssh_user: 'vagrant', testing: true }
26 27
 
27 28
     # ansible.tags = ['blog']
28 29
     # ansible.skip_tags = ['openvpn']
29 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 31
   end
35 32
 
36 33
 end

正在加载...
取消
保存