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

Merge pull request #7881 (Add playbook_command option) 

Note that error messages were not adapted, and only mention
a generic "Ansible Software" when executed commands are failing.
We assume that people using the `playbook_command` option are
advanced users that will know all the components to be considered.
This commit is contained in:
Gilles Cornu 2016-10-10 23:18:24 +02:00
parent 26e8bdc1f1 79a3cb8a14
commit b1ddc98e17
No known key found for this signature in database
GPG Key ID: F6BC2CF7E1FE8FFF
8 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/provisioners/ansible/config/base.rb
View File

@ -4,6 +4,7 @@ module VagrantPlugins
class Base < Vagrant.plugin("2", :config) class Base < Vagrant.plugin("2", :config)
GALAXY_COMMAND_DEFAULT = "ansible-galaxy install --role-file=%{role_file} --roles-path=%{roles_path} --force".freeze GALAXY_COMMAND_DEFAULT = "ansible-galaxy install --role-file=%{role_file} --roles-path=%{roles_path} --force".freeze
PLAYBOOK_COMMAND_DEFAULT = "ansible-playbook".freeze
attr_accessor :extra_vars attr_accessor :extra_vars
attr_accessor :galaxy_role_file attr_accessor :galaxy_role_file
@ -14,6 +15,7 @@ module VagrantPlugins
attr_accessor :inventory_path attr_accessor :inventory_path
attr_accessor :limit attr_accessor :limit
attr_accessor :playbook attr_accessor :playbook
attr_accessor :playbook_command
attr_accessor :raw_arguments attr_accessor :raw_arguments
attr_accessor :skip_tags attr_accessor :skip_tags
attr_accessor :start_at_task attr_accessor :start_at_task
@ -33,6 +35,7 @@ module VagrantPlugins
@inventory_path = UNSET_VALUE @inventory_path = UNSET_VALUE
@limit = UNSET_VALUE @limit = UNSET_VALUE
@playbook = UNSET_VALUE @playbook = UNSET_VALUE
@playbook_command = UNSET_VALUE
@raw_arguments = UNSET_VALUE @raw_arguments = UNSET_VALUE
@skip_tags = UNSET_VALUE @skip_tags = UNSET_VALUE
@start_at_task = UNSET_VALUE @start_at_task = UNSET_VALUE
@ -44,23 +47,24 @@ module VagrantPlugins
end end
def finalize! def finalize!
@extra_vars = nil if @extra_vars == UNSET_VALUE @extra_vars = nil if @extra_vars == UNSET_VALUE
@galaxy_role_file = nil if @galaxy_role_file == UNSET_VALUE @galaxy_role_file = nil if @galaxy_role_file == UNSET_VALUE
@galaxy_roles_path = nil if @galaxy_roles_path == UNSET_VALUE @galaxy_roles_path = nil if @galaxy_roles_path == UNSET_VALUE
@galaxy_command = GALAXY_COMMAND_DEFAULT if @galaxy_command == UNSET_VALUE @galaxy_command = GALAXY_COMMAND_DEFAULT if @galaxy_command == UNSET_VALUE
@host_vars = {} if @host_vars == UNSET_VALUE @host_vars = {} if @host_vars == UNSET_VALUE
@groups = {} if @groups == UNSET_VALUE @groups = {} if @groups == UNSET_VALUE
@inventory_path = nil if @inventory_path == UNSET_VALUE @inventory_path = nil if @inventory_path == UNSET_VALUE
@limit = nil if @limit == UNSET_VALUE @limit = nil if @limit == UNSET_VALUE
@playbook = nil if @playbook == UNSET_VALUE @playbook = nil if @playbook == UNSET_VALUE
@raw_arguments = nil if @raw_arguments == UNSET_VALUE @playbook_command = PLAYBOOK_COMMAND_DEFAULT if @playbook_command == UNSET_VALUE
@skip_tags = nil if @skip_tags == UNSET_VALUE @raw_arguments = nil if @raw_arguments == UNSET_VALUE
@start_at_task = nil if @start_at_task == UNSET_VALUE @skip_tags = nil if @skip_tags == UNSET_VALUE
@sudo = false if @sudo != true @start_at_task = nil if @start_at_task == UNSET_VALUE
@sudo_user = nil if @sudo_user == UNSET_VALUE @sudo = false if @sudo != true
@tags = nil if @tags == UNSET_VALUE @sudo_user = nil if @sudo_user == UNSET_VALUE
@vault_password_file = nil if @vault_password_file == UNSET_VALUE @tags = nil if @tags == UNSET_VALUE
@verbose = false if @verbose == UNSET_VALUE @vault_password_file = nil if @vault_password_file == UNSET_VALUE
@verbose = false if @verbose == UNSET_VALUE
end end
# Just like the normal configuration "validate" method except that # Just like the normal configuration "validate" method except that

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

@ -44,7 +44,7 @@ module VagrantPlugins
end end
end end
shell_command << "ansible-playbook" shell_command << config.playbook_command
shell_args = [] shell_args = []
@command_arguments.each do |arg| @command_arguments.each do |arg|

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

@ -113,7 +113,7 @@ module VagrantPlugins
prepare_environment_variables prepare_environment_variables
# Assemble the full ansible-playbook command # Assemble the full ansible-playbook command
command = %w(ansible-playbook) << @command_arguments command = [config.playbook_command] << @command_arguments
# Add the raw arguments at the end, to give them the highest precedence # Add the raw arguments at the end, to give them the highest precedence
command << config.raw_arguments if config.raw_arguments command << config.raw_arguments if config.raw_arguments

1
test/unit/plugins/provisioners/ansible/config/guest_test.rb
View File

@ -27,6 +27,7 @@ describe VagrantPlugins::Ansible::Config::Guest do
inventory_path inventory_path
limit limit
playbook playbook
playbook_command
provisioning_path provisioning_path
raw_arguments raw_arguments
skip_tags skip_tags

1
test/unit/plugins/provisioners/ansible/config/host_test.rb
View File

@ -26,6 +26,7 @@ describe VagrantPlugins::Ansible::Config::Host, :skip_windows => true do
inventory_path inventory_path
limit limit
playbook playbook
playbook_command
raw_arguments raw_arguments
raw_ssh_args raw_ssh_args
skip_tags skip_tags

1
test/unit/plugins/provisioners/ansible/config/shared.rb
View File

@ -12,6 +12,7 @@ shared_examples_for 'options shared by both Ansible provisioners' do
expect(subject.inventory_path).to be_nil expect(subject.inventory_path).to be_nil
expect(subject.limit).to be_nil expect(subject.limit).to be_nil
expect(subject.playbook).to be_nil expect(subject.playbook).to be_nil
expect(subject.playbook_command).to eql("ansible-playbook")
expect(subject.raw_arguments).to be_nil expect(subject.raw_arguments).to be_nil
expect(subject.skip_tags).to be_nil expect(subject.skip_tags).to be_nil
expect(subject.start_at_task).to be_nil expect(subject.start_at_task).to be_nil

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

@ -273,6 +273,18 @@ VF
end end
end end
describe "with playbook_command option" do
before do
config.playbook_command = "custom-ansible-playbook"
end
it "uses custom playbook_command to run playbooks" do
expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
expect(args[0]).to eq("custom-ansible-playbook")
}
end
end
describe "with host_vars option" do describe "with host_vars option" do
it_should_create_and_use_generated_inventory it_should_create_and_use_generated_inventory

4
website/source/docs/provisioning/ansible_common.html.md
View File

@ -78,6 +78,10 @@ Some of these options are for advanced usage only and should not be used unless
By default, this option is disabled and Vagrant generates an inventory based on the `Vagrantfile` information. By default, this option is disabled and Vagrant generates an inventory based on the `Vagrantfile` information.
- `playbook_command` (string) - The command used to run playbooks.
The default value is `ansible-playbook`
- `galaxy_command` (template string) - The command pattern used to install Galaxy roles when `galaxy_role_file` is set. - `galaxy_command` (template string) - The command pattern used to install Galaxy roles when `galaxy_role_file` is set.
The following (optional) placeholders can be used in this command pattern: The following (optional) placeholders can be used in this command pattern: