vagrant-unbundled 1.8.1.2 → 1.8.4.1

data/plugins/provisioners/ansible/config/host.rb

@@ -34,28 +34,18 @@ module VagrantPlugins
         def validate(machine)
           super
 
-          { "ansible remote provisioner" => @errors }
-        end
-
-        protected
-
-        def check_path(machine, path, path_test_method, error_message_key = nil)
-          expanded_path = Pathname.new(path).expand_path(machine.env.root_path)
-          if !expanded_path.public_send(path_test_method)
-            if error_message_key
-              @errors << I18n.t(error_message_key, path: expanded_path, system: "host")
+          if raw_ssh_args
+            if raw_ssh_args.kind_of?(String)
+              @raw_ssh_args = [raw_ssh_args]
+            elsif !raw_ssh_args.kind_of?(Array)
+              @errors << I18n.t(
+                "vagrant.provisioners.ansible.errors.raw_ssh_args_invalid",
+                type:  raw_ssh_args.class.to_s,
+                value: raw_ssh_args.to_s)
             end
-            return false
           end
-          true
-        end
-
-        def check_path_is_a_file(machine, path, error_message_key = nil)
-          check_path(machine, path, "file?", error_message_key)
-        end
 
-        def check_path_exists(machine, path, error_message_key = nil)
-          check_path(machine, path, "exist?", error_message_key)
+          { "ansible remote provisioner" => @errors }
         end
 
       end

data/plugins/provisioners/ansible/errors.rb

@@ -19,6 +19,10 @@ module VagrantPlugins
         error_key(:ansible_not_found_on_guest)
       end
 
+      class AnsiblePipInstallIsNotSupported < AnsibleError
+        error_key(:cannot_support_pip_install)
+      end
+
       class AnsibleVersionNotFoundOnGuest < AnsibleError
         error_key(:ansible_version_not_found_on_guest)
       end

data/plugins/provisioners/ansible/helpers.rb

@@ -3,35 +3,15 @@ require "vagrant"
 module VagrantPlugins
   module Ansible
     class Helpers
-      def self.stringify_ansible_playbook_command(env, command)
-        shell_command = ''
-        env.each_pair do |k, v|
-          if k == 'ANSIBLE_SSH_ARGS'
-            shell_command += "#{k}='#{v}' "
-          else
-            shell_command += "#{k}=#{v} "
-          end
-        end
-
-        shell_arg = []
-        command.each do |arg|
-          if arg =~ /(--start-at-task|--limit)=(.+)/
-            shell_arg << "#{$1}='#{$2}'"
-          else
-            shell_arg << arg
-          end
-        end
-
-        shell_command += shell_arg.join(' ')
+      def self.expand_path_in_unix_style(path, base_dir)
+        # Remove the possible drive letter, which is added
+        # by `File.expand_path` when running on a Windows host
+        File.expand_path(path, base_dir).sub(/^[a-zA-Z]:/, "")
       end
 
       def self.as_list_argument(v)
         v.kind_of?(Array) ? v.join(',') : v
       end
-
-      def self.as_array(v)
-        v.kind_of?(Array) ? v : [v]
-      end
    end
   end
 end

data/plugins/provisioners/ansible/provisioner/base.rb

@@ -25,6 +25,48 @@ module VagrantPlugins
           @inventory_path = nil
         end
 
+        def check_files_existence
+          check_path_is_a_file config.playbook, :playbook
+
+          check_path_exists config.inventory_path, :inventory_path if config.inventory_path
+          check_path_is_a_file config.extra_vars[1..-1], :extra_vars if has_an_extra_vars_file_argument
+          check_path_is_a_file config.galaxy_role_file, :galaxy_role_file if config.galaxy_role_file
+          check_path_is_a_file config.vault_password_file, :vault_password if config.vault_password_file
+        end
+
+        def ansible_playbook_command_for_shell_execution
+          shell_command = []
+          @environment_variables.each_pair do |k, v|
+            if k =~ /ANSIBLE_SSH_ARGS|ANSIBLE_ROLES_PATH/
+              shell_command << "#{k}='#{v}'"
+            else
+              shell_command << "#{k}=#{v}"
+            end
+          end
+
+          shell_command << "ansible-playbook"
+
+          shell_args = []
+          @command_arguments.each do |arg|
+            if arg =~ /(--start-at-task|--limit)=(.+)/
+              shell_args << %Q(#{$1}="#{$2}")
+            elsif arg =~ /(--extra-vars)=(.+)/
+              shell_args << %Q(%s="%s") % [$1, $2.gsub('\\', '\\\\\\').gsub('"', %Q(\\"))]
+            else
+              shell_args << arg
+            end
+          end
+
+          shell_command << shell_args
+
+          # Add the raw arguments at the end, to give them the highest precedence
+          shell_command << config.raw_arguments if config.raw_arguments
+
+          shell_command << config.playbook
+
+          shell_command.flatten.join(' ')
+        end
+
         def prepare_common_command_arguments
           # By default we limit by the current machine,
           # but this can be overridden by the `limit` option.
@@ -43,10 +85,6 @@ module VagrantPlugins
           @command_arguments << "--tags=#{Helpers::as_list_argument(config.tags)}" if config.tags
           @command_arguments << "--skip-tags=#{Helpers::as_list_argument(config.skip_tags)}" if config.skip_tags
           @command_arguments << "--start-at-task=#{config.start_at_task}" if config.start_at_task
-
-          # Finally, add the raw configuration options, which has the highest precedence
-          # and can therefore potentially override any other options of this provisioner.
-          @command_arguments.concat(Helpers::as_array(config.raw_arguments)) if config.raw_arguments
         end
 
         def prepare_common_environment_variables
@@ -60,6 +98,10 @@ module VagrantPlugins
           # Setting ANSIBLE_NOCOLOR is "unnecessary" at the moment, but this could change in the future
           # (e.g. local provisioner [GH-2103], possible change in vagrant/ansible integration, etc.)
           @environment_variables["ANSIBLE_NOCOLOR"] = "true" if !@machine.env.ui.color?
+
+          # Use ANSIBLE_ROLES_PATH to tell ansible-playbook where to look for roles
+          # (there is no equivalent command line argument in ansible-playbook)
+          @environment_variables["ANSIBLE_ROLES_PATH"] = get_galaxy_roles_path if config.galaxy_roles_path
         end
 
         # Auto-generate "safe" inventory file based on Vagrantfile,
@@ -169,8 +211,12 @@ module VagrantPlugins
           return inventory_groups
         end
 
+        def has_an_extra_vars_file_argument
+          config.extra_vars && config.extra_vars.kind_of?(String) && config.extra_vars =~ /^@.+$/
+        end
+
         def extra_vars_argument
-          if config.extra_vars.kind_of?(String) and config.extra_vars =~ /^@.+$/
+          if has_an_extra_vars_file_argument
             # A JSON or YAML file is referenced.
             config.extra_vars
           else
@@ -179,15 +225,17 @@ module VagrantPlugins
           end
         end
 
-        def get_galaxy_role_file(basedir)
-          File.expand_path(config.galaxy_role_file, basedir)
+        def get_galaxy_role_file
+          Helpers::expand_path_in_unix_style(config.galaxy_role_file, get_provisioning_working_directory)
         end
 
-        def get_galaxy_roles_path(basedir)
+        def get_galaxy_roles_path
+          base_dir = get_provisioning_working_directory
           if config.galaxy_roles_path
-            File.expand_path(config.galaxy_roles_path, basedir)
+            Helpers::expand_path_in_unix_style(config.galaxy_roles_path, base_dir)
           else
-            File.join(Pathname.new(config.playbook).expand_path(basedir).parent, 'roles')
+            playbook_path = Helpers::expand_path_in_unix_style(config.playbook, base_dir)
+            File.join(Pathname.new(playbook_path).parent, 'roles')
           end
         end
 

data/plugins/provisioners/ansible/provisioner/guest.rb

@@ -1,4 +1,4 @@
-require 'tempfile'
+require "tempfile"
 
 require_relative "base"
 
@@ -6,6 +6,7 @@ module VagrantPlugins
   module Ansible
     module Provisioner
       class Guest < Base
+        include Vagrant::Util
 
         def initialize(machine, config)
           super
@@ -13,6 +14,7 @@ module VagrantPlugins
         end
 
         def provision
+          check_files_existence
           check_and_install_ansible
           execute_ansible_galaxy_on_guest if config.galaxy_role_file
           execute_ansible_playbook_on_guest
@@ -47,14 +49,15 @@ module VagrantPlugins
              (config.version.to_s.to_sym == :latest ||
               !@machine.guest.capability(:ansible_installed, config.version))
             @machine.ui.detail I18n.t("vagrant.provisioners.ansible.installing")
-            @machine.guest.capability(:ansible_install)
+            @machine.guest.capability(:ansible_install, config.install_mode, config.version)
           end
 
           # Check that ansible binaries are well installed on the guest,
           @machine.communicate.execute(
-            "ansible-galaxy --help && ansible-playbook --help",
-            :error_class => Ansible::Errors::AnsibleNotFoundOnGuest,
-            :error_key => :ansible_not_found_on_guest)
+            "ansible-galaxy info --help && ansible-playbook --help",
+            error_class: Ansible::Errors::AnsibleNotFoundOnGuest,
+            error_key: :ansible_not_found_on_guest
+          )
 
           # Check if requested ansible version is available
           if (!config.version.empty? &&
@@ -64,11 +67,16 @@ module VagrantPlugins
           end
         end
 
+        def get_provisioning_working_directory
+          config.provisioning_path
+        end
+
         def execute_ansible_galaxy_on_guest
           command_values = {
-            :role_file => get_galaxy_role_file(config.provisioning_path),
-            :roles_path => get_galaxy_roles_path(config.provisioning_path)
+            role_file: "'#{get_galaxy_role_file}'",
+            roles_path: "'#{get_galaxy_roles_path}'"
           }
+
           remote_command = config.galaxy_command % command_values
 
           execute_ansible_command_on_guest "galaxy", remote_command
@@ -78,23 +86,22 @@ module VagrantPlugins
           prepare_common_command_arguments
           prepare_common_environment_variables
 
-          command = (%w(ansible-playbook) << @command_arguments << config.playbook).flatten
-          remote_command = "cd #{config.provisioning_path} && #{Helpers::stringify_ansible_playbook_command(@environment_variables, command)}"
-
-          execute_ansible_command_on_guest "playbook", remote_command
+          execute_ansible_command_on_guest "playbook", ansible_playbook_command_for_shell_execution
         end
 
         def execute_ansible_command_on_guest(name, command)
-          ui_running_ansible_command name, command
+          remote_command = "cd #{config.provisioning_path} && #{command}"
 
-          result = execute_on_guest(command)
+          ui_running_ansible_command name, remote_command
+
+          result = execute_on_guest(remote_command)
           raise Ansible::Errors::AnsibleCommandFailed if result != 0
         end
 
         def execute_on_guest(command)
-          @machine.communicate.execute(command, :error_check => false) do |type, data|
+          @machine.communicate.execute(command, error_check: false) do |type, data|
             if [:stderr, :stdout].include?(type)
-              @machine.env.ui.info(data, :new_line => false, :prefix => false)
+              @machine.env.ui.info(data, new_line: false, prefix: false)
             end
           end
         end
@@ -103,14 +110,15 @@ module VagrantPlugins
           inventory_basedir = File.join(config.tmp_path, "inventory")
           inventory_path = File.join(inventory_basedir, "vagrant_ansible_local_inventory")
 
-          temp_inventory = Tempfile.new("vagrant_ansible_local_inventory_#{@machine.name}")
-          temp_inventory.write(inventory_content)
-          temp_inventory.close
-
           create_and_chown_remote_folder(inventory_basedir)
-          @machine.communicate.tap do |comm|
-            comm.sudo("rm -f #{inventory_path}", error_check: false)
-            comm.upload(temp_inventory.path, inventory_path)
+          @machine.communicate.sudo("rm -f #{inventory_path}", error_check: false)
+
+          Tempfile.open("vagrant-ansible-local-inventory-#{@machine.name}") do |f|
+            f.binmode
+            f.write(inventory_content)
+            f.fsync
+            f.close
+            @machine.communicate.upload(f.path, inventory_path)
           end
 
           return inventory_basedir
@@ -143,6 +151,31 @@ module VagrantPlugins
           end
         end
 
+        def check_path(path, test_args, option_name)
+          # Checks for the existence of given file (or directory) on the guest system,
+          # and error if it doesn't exist.
+
+          remote_path = Helpers::expand_path_in_unix_style(path, config.provisioning_path)
+          command = "test #{test_args} #{remote_path}"
+
+          @machine.communicate.execute(
+            command,
+            error_class: Ansible::Errors::AnsibleError,
+            error_key: :config_file_not_found,
+            config_option: option_name,
+            path: remote_path,
+            system: "guest"
+          )
+        end
+
+        def check_path_is_a_file(path, error_message_key)
+          check_path(path, "-f", error_message_key)
+        end
+
+        def check_path_exists(path, error_message_key)
+          check_path(path, "-e", error_message_key)
+        end
+
       end
     end
   end

data/plugins/provisioners/ansible/provisioner/host.rb

@@ -18,6 +18,7 @@ module VagrantPlugins
           # At this stage, the SSH access is guaranteed to be ready
           @ssh_info = @machine.ssh_info
 
+          check_files_existence
           warn_for_unsupported_platform
           execute_ansible_galaxy_from_host if config.galaxy_role_file
           execute_ansible_playbook_from_host
@@ -88,14 +89,12 @@ module VagrantPlugins
 
         def execute_ansible_galaxy_from_host
           command_values = {
-            :role_file => get_galaxy_role_file(machine.env.root_path),
-            :roles_path => get_galaxy_roles_path(machine.env.root_path)
+            role_file: get_galaxy_role_file,
+            roles_path: get_galaxy_roles_path
           }
           command_template = config.galaxy_command.gsub(' ', VAGRANT_ARG_SEPARATOR)
           str_command = command_template % command_values
 
-          ui_running_ansible_command "galaxy", str_command.gsub(VAGRANT_ARG_SEPARATOR, ' ')
-
           command = str_command.split(VAGRANT_ARG_SEPARATOR)
           command << {
             # Write stdout and stderr data, since it's the regular Ansible output
@@ -103,6 +102,9 @@ module VagrantPlugins
             workdir: @machine.env.root_path.to_s
           }
 
+          # FIXME: role_file and roles_path arguments should be quoted in the console output
+          ui_running_ansible_command "galaxy", str_command.gsub(VAGRANT_ARG_SEPARATOR, ' ')
+
           execute_command_from_host command
         end
 
@@ -111,9 +113,13 @@ module VagrantPlugins
           prepare_environment_variables
 
           # Assemble the full ansible-playbook command
-          command = (%w(ansible-playbook) << @command_arguments << config.playbook).flatten
+          command = %w(ansible-playbook) << @command_arguments
 
-          ui_running_ansible_command "playbook", Helpers::stringify_ansible_playbook_command(@environment_variables, command)
+          # Add the raw arguments at the end, to give them the highest precedence
+          command << config.raw_arguments if config.raw_arguments
+
+          command << config.playbook
+          command = command.flatten
 
           command << {
             env: @environment_variables,
@@ -122,6 +128,8 @@ module VagrantPlugins
             workdir: @machine.env.root_path.to_s
           }
 
+          ui_running_ansible_command "playbook", ansible_playbook_command_for_shell_execution
+
           execute_command_from_host command
         end
 
@@ -132,8 +140,15 @@ module VagrantPlugins
           inventory_file = Pathname.new(File.join(inventory_path, 'vagrant_ansible_inventory'))
           @@lock.synchronize do
             if !File.exists?(inventory_file) or inventory_content != File.read(inventory_file)
-              inventory_file.open('w') do |file|
-                file.write(inventory_content)
+              begin
+                # ansible dir inventory will ignore files starting with '.'
+                inventory_tmpfile = Tempfile.new('.vagrant_ansible_inventory', inventory_path)
+                inventory_tmpfile.write(inventory_content)
+                inventory_tmpfile.close
+                File.rename(inventory_tmpfile.path, inventory_file)
+              ensure
+                inventory_tmpfile.close
+                inventory_tmpfile.unlink
               end
             end
           end
@@ -174,6 +189,10 @@ module VagrantPlugins
           return machines
         end
 
+        def get_provisioning_working_directory
+          machine.env.root_path
+        end
+
         def get_inventory_ssh_machine(machine, ssh_info)
           forced_remote_user = ""
           if config.force_remote_user
@@ -237,7 +256,7 @@ module VagrantPlugins
           ssh_options << "-o ForwardAgent=yes" if @ssh_info[:forward_agent]
 
           # Unchecked SSH Parameters
-          ssh_options.concat(Helpers::as_array(config.raw_ssh_args)) if config.raw_ssh_args
+          ssh_options.concat(config.raw_ssh_args) if config.raw_ssh_args
 
           # Re-enable ControlPersist Ansible defaults,
           # which are lost when ANSIBLE_SSH_ARGS is defined.
@@ -251,6 +270,28 @@ module VagrantPlugins
           ssh_options.join(' ')
         end
 
+        def check_path(path, path_test_method, option_name)
+          # Checks for the existence of given file (or directory) on the host system,
+          # and error if it doesn't exist.
+
+          expanded_path = Pathname.new(path).expand_path(@machine.env.root_path)
+          if !expanded_path.public_send(path_test_method)
+            raise Ansible::Errors::AnsibleError,
+                  _key: :config_file_not_found,
+                  config_option: option_name,
+                  path: expanded_path,
+                  system: "host"
+          end
+        end
+
+        def check_path_is_a_file(path, option_name)
+          check_path(path, "file?", option_name)
+        end
+
+        def check_path_exists(path, option_name)
+          check_path(path, "exist?", option_name)
+        end
+
       end
     end
   end