diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a31a23a3..0b7a9d899 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ BUG FIXES: homebrew. [GH-2188] - installer/mac: deb/rpm packages now have an epoch of 1 so that new installers don't appear older. [GH-2179] + - provisioners/ansible: Default output level is now verbose again. [GH-2194] - providers/virtualbox: Fix an issue where destroy middlewares weren't being properly called. [GH-2200] diff --git a/plugins/provisioners/ansible/provisioner.rb b/plugins/provisioners/ansible/provisioner.rb index bbfda33b3..0fdad491d 100644 --- a/plugins/provisioners/ansible/provisioner.rb +++ b/plugins/provisioners/ansible/provisioner.rb @@ -23,10 +23,11 @@ module VagrantPlugins end options << "--extra-vars=\"#{extra_vars.join(" ")}\"" end + options << "--inventory-file=#{self.setup_inventory_file}" options << "--sudo" if config.sudo options << "--sudo-user=#{config.sudo_user}" if config.sudo_user - options << "#{self.get_verbosity_argument}" if config.verbose + options << "#{self.get_verbosity_argument}" options << "--ask-sudo-pass" if config.ask_sudo_pass options << "--tags=#{as_list_argument(config.tags)}" if config.tags options << "--skip-tags=#{as_list_argument(config.skip_tags)}" if config.skip_tags @@ -38,7 +39,10 @@ module VagrantPlugins # Write stdout and stderr data, since it's the regular Ansible output command << { - :env => { "ANSIBLE_FORCE_COLOR" => "true" , "ANSIBLE_HOST_KEY_CHECKING" => "#{config.host_key_checking}" }, + :env => { + "ANSIBLE_FORCE_COLOR" => "true", + "ANSIBLE_HOST_KEY_CHECKING" => "#{config.host_key_checking}" + }, :notify => [:stdout, :stderr], :workdir => @machine.env.root_path.to_s } @@ -79,12 +83,12 @@ module VagrantPlugins def get_verbosity_argument if config.verbose.to_s =~ /^v+$/ # Hopefully ansible-playbook accepts "silly" arguments like '-vvvvv', as '-vvv' - "-#{config.verbose}" + return "-#{config.verbose}" elsif config.verbose.to_s == 'extra' - '-vvv' + return '-vvv' else # fall back to default verbosity - '--verbose' + return '--verbose' end end