haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

provisioners/ansible: Don't run with two --limits 

Conflicts:
	test/unit/plugins/provisioners/ansible/provisioner_test.rb
This commit is contained in:
jjshoe 2014-04-16 15:26:19 -05:00 committed by Gilles Cornu
parent 557a451e2f
commit 7ef8477e43
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/provisioners/ansible/provisioner.rb
View File

@ -26,7 +26,7 @@ module VagrantPlugins
# By default we limit by the current machine. # By default we limit by the current machine.
# This can be overridden by the limit config option. # This can be overridden by the limit config option.
options << "--limit=#{@machine.name}" options << "--limit=#{@machine.name}" unless config.limit
# #
# 2) Configuration Joker # 2) Configuration Joker

12
test/unit/plugins/provisioners/ansible/provisioner_test.rb
View File

@ -330,14 +330,8 @@ VF
config.limit = %w(foo !bar) config.limit = %w(foo !bar)
end end
it_should_set_arguments_and_environment_variables 6 it_should_set_arguments_and_environment_variables 5
it_should_set_optional_arguments({ "limit" => "--limit=foo,!bar" }) it_should_set_optional_arguments({ "limit" => "--limit=foo,!bar" })
it "sets custom limit argument after implicit default limit" do
expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
expect(args.index("--limit=foo,!bar")).to be > args.index("--limit=#{machine.name}")
}
end
end end
describe "with inventory_path option" do describe "with inventory_path option" do
@ -440,7 +434,7 @@ VF
end end
# Note: # Note:
# The Vagrant Ansible provisioner does not validate the coherency of arguments combination, # The Vagrant Ansible provisioner does not validate the coherency of argument combinations,
# and let ansible-playbook complain. # and let ansible-playbook complain.
describe "with a maximum of options" do describe "with a maximum of options" do
before do before do
@ -463,7 +457,7 @@ VF
config.raw_ssh_args = ['-o ControlMaster=no'] config.raw_ssh_args = ['-o ControlMaster=no']
end end
it_should_set_arguments_and_environment_variables 20, 4, true it_should_set_arguments_and_environment_variables 19, 4, true
it_should_force_ssh_transport_mode it_should_force_ssh_transport_mode
it_should_set_optional_arguments({ "extra_vars" => "--extra-vars=@#{File.expand_path(__FILE__)}", it_should_set_optional_arguments({ "extra_vars" => "--extra-vars=@#{File.expand_path(__FILE__)}",
"sudo" => "--sudo", "sudo" => "--sudo",