Ansible provisioner support CHANGELOG

This commit is contained in:
Mitchell Hashimoto 2013-04-04 13:48:58 -07:00
parent 1c2a46ba72
commit 896db2f190
2 changed files with 10 additions and 5 deletions

View File

@ -19,6 +19,7 @@ FEATURES:
This new abstraction allows plugins to define "capabilities" that This new abstraction allows plugins to define "capabilities" that
certain guest operating systems can implement. This allows greater certain guest operating systems can implement. This allows greater
flexibility in doing guest-specific behavior. flexibility in doing guest-specific behavior.
- Ansible provisioner support. [GH-1465]
IMPROVEMENTS: IMPROVEMENTS:

View File

@ -8,6 +8,7 @@ module VagrantPlugins
options << "--extra-vars=\"#{config.extra_vars}\"" if config.extra_vars options << "--extra-vars=\"#{config.extra_vars}\"" if config.extra_vars
options << "--inventory-file=#{config.inventory_file}" if config.inventory_file options << "--inventory-file=#{config.inventory_file}" if config.inventory_file
options << "--ask-sudo-pass" if config.ask_sudo_pass options << "--ask-sudo-pass" if config.ask_sudo_pass
if config.limit if config.limit
if not config.limit.kind_of?(Array) if not config.limit.kind_of?(Array)
config.limit = [config.limit] config.limit = [config.limit]
@ -15,6 +16,7 @@ module VagrantPlugins
config.limit = config.limit.join(",") config.limit = config.limit.join(",")
options << "--limit=#{config.limit}" options << "--limit=#{config.limit}"
end end
options << "--sudo" if config.sudo options << "--sudo" if config.sudo
options << "--sudo-user=#{config.sudo_user}" if config.sudo_user options << "--sudo-user=#{config.sudo_user}" if config.sudo_user
options << "--verbose" if config.verbose options << "--verbose" if config.verbose
@ -27,9 +29,11 @@ module VagrantPlugins
:env => { "ANSIBLE_FORCE_COLOR" => "true" }, :env => { "ANSIBLE_FORCE_COLOR" => "true" },
:notify => [:stdout, :stderr] :notify => [:stdout, :stderr]
} }
Vagrant::Util::Subprocess.execute(*command) do |type, data| Vagrant::Util::Subprocess.execute(*command) do |type, data|
puts "#{data}" if type == :stdout || type == :stderr if type == :stdout || type == :stderr
yield type, data if block_given? @machine.env.ui.info(data.chomp, :prefix => false)
end
end end
end end
end end