vagrant-unbundled 1.8.1.2 → 1.8.4.1

data/plugins/providers/virtualbox/driver/version_4_2.rb

@@ -238,7 +238,7 @@ module VagrantPlugins
         end
 
         def max_network_adapters
-          36
+          8
         end
 
         def read_forwarded_ports(uuid=nil, active_only=false)
@@ -594,9 +594,9 @@ module VagrantPlugins
             result = raw("showvminfo", uuid)
             return true if result.exit_code == 0
 
-            # GH-2479: Sometimes this happens. In this case, retry. If
-            # we don't see this text, the VM really probably doesn't exist.
-            return false if !result.stderr.include?("CO_E_SERVER_EXEC_FAILURE")
+            # If vboxmanage returned VBOX_E_OBJECT_NOT_FOUND,
+            # then the vm truly does not exist. Any other error might be transient
+            return false if result.stderr.include?("VBOX_E_OBJECT_NOT_FOUND")
 
             # Sleep a bit though to give VirtualBox time to fix itself
             sleep 2
@@ -656,7 +656,8 @@ module VagrantPlugins
 
           result.sort
         rescue Vagrant::Errors::VBoxManageError => e
-          return [] if e.extra_data[:stdout].include?("does not have")
+          d = e.extra_data
+          return [] if d[:stderr].include?("does not have") || d[:stdout].include?("does not have")
           raise
         end
 

data/plugins/providers/virtualbox/driver/version_4_3.rb

@@ -135,7 +135,8 @@ module VagrantPlugins
 
           result.sort
         rescue Vagrant::Errors::VBoxManageError => e
-          return [] if e.extra_data[:stdout].include?("does not have")
+          d = e.extra_data
+          return [] if d[:stderr].include?("does not have") || d[:stdout].include?("does not have")
           raise
         end
 
@@ -347,7 +348,7 @@ module VagrantPlugins
         end
 
         def max_network_adapters
-          36
+          8
         end
 
         def read_forwarded_ports(uuid=nil, active_only=false)
@@ -700,9 +701,9 @@ module VagrantPlugins
             result = raw("showvminfo", uuid)
             return true if result.exit_code == 0
 
-            # GH-2479: Sometimes this happens. In this case, retry. If
-            # we don't see this text, the VM really probably doesn't exist.
-            return false if !result.stderr.include?("CO_E_SERVER_EXEC_FAILURE")
+            # If vboxmanage returned VBOX_E_OBJECT_NOT_FOUND,
+            # then the vm truly does not exist. Any other error might be transient
+            return false if result.stderr.include?("VBOX_E_OBJECT_NOT_FOUND")
 
             # Sleep a bit though to give VirtualBox time to fix itself
             sleep 2

data/plugins/providers/virtualbox/driver/version_5_0.rb

@@ -131,7 +131,8 @@ module VagrantPlugins
 
           result.sort
         rescue Vagrant::Errors::VBoxManageError => e
-          return [] if e.extra_data[:stdout].include?("does not have")
+          d = e.extra_data
+          return [] if d[:stderr].include?("does not have") || d[:stdout].include?("does not have")
           raise
         end
 
@@ -343,7 +344,7 @@ module VagrantPlugins
         end
 
         def max_network_adapters
-          36
+          8
         end
 
         def read_forwarded_ports(uuid=nil, active_only=false)
@@ -701,9 +702,9 @@ module VagrantPlugins
             result = raw("showvminfo", uuid)
             return true if result.exit_code == 0
 
-            # GH-2479: Sometimes this happens. In this case, retry. If
-            # we don't see this text, the VM really probably doesn't exist.
-            return false if !result.stderr.include?("CO_E_SERVER_EXEC_FAILURE")
+            # If vboxmanage returned VBOX_E_OBJECT_NOT_FOUND,
+            # then the vm truly does not exist. Any other error might be transient
+            return false if result.stderr.include?("VBOX_E_OBJECT_NOT_FOUND")
 
             # Sleep a bit though to give VirtualBox time to fix itself
             sleep 2

data/plugins/provisioners/ansible/cap/guest/arch/ansible_install.rb

@@ -1,3 +1,4 @@
+require_relative "../../../errors"
 
 module VagrantPlugins
   module Ansible
@@ -6,9 +7,13 @@ module VagrantPlugins
         module Arch
           module AnsibleInstall
 
-            def self.ansible_install(machine)
-              machine.communicate.sudo("pacman -Syy --noconfirm")
-              machine.communicate.sudo("pacman -S --noconfirm ansible")
+            def self.ansible_install(machine, install_mode, ansible_version)
+              if install_mode == :pip
+                raise Ansible::Errors::AnsiblePipInstallIsNotSupported
+              else
+                machine.communicate.sudo "pacman -Syy --noconfirm"
+                machine.communicate.sudo "pacman -S --noconfirm ansible"
+              end
             end
 
           end

data/plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb

@@ -1,3 +1,4 @@
+require_relative "../pip/pip"
 
 module VagrantPlugins
   module Ansible
@@ -6,8 +7,23 @@ module VagrantPlugins
         module Debian
           module AnsibleInstall
 
-            def self.ansible_install(machine)
 
+            def self.ansible_install(machine, install_mode, ansible_version)
+              if (install_mode == :pip)
+                ansible_pip_install machine, ansible_version
+              else
+                ansible_apt_install machine
+              end
+            end
+
+            def self.ansible_pip_install(machine, ansible_version)
+              pip_setup machine
+              Pip::pip_install machine, "ansible", ansible_version
+            end
+
+            private
+
+            def self.ansible_apt_install(machine)
 install_backports_if_wheezy_release = <<INLINE_CRIPT
 CODENAME=`lsb_release -cs`
 if [ x$CODENAME == 'xwheezy' ]; then
@@ -15,9 +31,15 @@ if [ x$CODENAME == 'xwheezy' ]; then
 fi
 INLINE_CRIPT
 
-              machine.communicate.sudo(install_backports_if_wheezy_release)
-              machine.communicate.sudo("apt-get update -y -qq")
-              machine.communicate.sudo("apt-get install -y -qq ansible")
+              machine.communicate.sudo install_backports_if_wheezy_release
+              machine.communicate.sudo "apt-get update -y -qq"
+              machine.communicate.sudo "apt-get install -y -qq ansible"
+            end
+
+            def self.pip_setup(machine)
+              machine.communicate.sudo "apt-get update -y -qq"
+              machine.communicate.sudo "apt-get install -y -qq build-essential curl git libssl-dev libffi-dev python-dev"
+              Pip::get_pip machine
             end
 
           end

data/plugins/provisioners/ansible/cap/guest/facts.rb

@@ -0,0 +1,24 @@
+
+module VagrantPlugins
+  module Ansible
+    module Cap
+      module Guest
+        module Facts
+
+          def self.dnf?(machine)
+            machine.communicate.test "/usr/bin/which -s dnf"
+          end
+
+          def self.yum?(machine)
+            machine.communicate.test "/usr/bin/which -s yum"
+          end
+
+          def self.rpm_package_manager(machine)
+            dnf?(machine) ? "dnf" : "yum"
+          end
+
+        end
+      end
+    end
+  end
+end

data/plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb

@@ -1,3 +1,5 @@
+require_relative "../facts"
+require_relative "../pip/pip"
 
 module VagrantPlugins
   module Ansible
@@ -6,16 +8,24 @@ module VagrantPlugins
         module Fedora
           module AnsibleInstall
 
-            def self.ansible_install(machine)
-              if dnf?(machine)
-                machine.communicate.sudo("dnf -y install ansible")
+            def self.ansible_install(machine, install_mode, ansible_version)
+              rpm_package_manager = Facts::rpm_package_manager(machine)
+
+              if install_mode == :pip
+                pip_setup machine
+                Pip::pip_install machine, "ansible", ansible_version
               else
-                machine.communicate.sudo("yum -y install ansible")
+                machine.communicate.sudo "#{rpm_package_manager} -y install ansible"
               end
             end
 
-            def self.dnf?(machine)
-              machine.communicate.test("/usr/bin/which -s dnf")
+            private
+
+            def self.pip_setup(machine)
+              rpm_package_manager = Facts::rpm_package_manager(machine)
+
+              machine.communicate.sudo "#{rpm_package_manager} install -y curl gcc gmp-devel libffi-devel openssl-devel python-crypto python-devel python-dnf python-setuptools redhat-rpm-config"
+              Pip::get_pip machine
             end
 
           end

data/plugins/provisioners/ansible/cap/guest/freebsd/ansible_install.rb

@@ -1,3 +1,4 @@
+require_relative "../../../errors"
 
 module VagrantPlugins
   module Ansible
@@ -6,8 +7,12 @@ module VagrantPlugins
         module FreeBSD
           module AnsibleInstall
 
-            def self.ansible_install(machine)
-              machine.communicate.sudo("yes | pkg install ansible")
+            def self.ansible_install(machine, install_mode, ansible_version)
+              if install_mode == :pip
+                raise Ansible::Errors::AnsiblePipInstallIsNotSupported
+              else
+                machine.communicate.sudo "yes | pkg install ansible"
+              end
             end
 
           end

data/plugins/provisioners/ansible/cap/guest/pip/pip.rb

@@ -0,0 +1,28 @@
+
+module VagrantPlugins
+  module Ansible
+    module Cap
+      module Guest
+        module Pip
+
+          def self.pip_install(machine, package, version = "", upgrade = true)
+            upgrade_arg = "--upgrade " if upgrade
+            version_arg = ""
+
+            if !version.to_s.empty? && version.to_s.to_sym != :latest
+              version_arg = "==#{version}"
+            end
+
+            machine.communicate.sudo "pip install #{upgrade_arg}#{package}#{version_arg}"
+          end
+
+          def self.get_pip(machine)
+            machine.ui.detail I18n.t("vagrant.provisioners.ansible.installing_pip")
+            machine.communicate.execute "curl https://bootstrap.pypa.io/get-pip.py | sudo python"
+          end
+
+        end
+      end
+    end
+  end
+end

data/plugins/provisioners/ansible/cap/guest/posix/ansible_installed.rb

@@ -14,7 +14,7 @@ module VagrantPlugins
                 command << "&& ansible --version | grep 'ansible #{version}'"
               end
 
-              machine.communicate.test(command, sudo: false)
+              machine.communicate.test command, sudo: false
             end
 
           end

data/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb

@@ -1,3 +1,5 @@
+require_relative "../facts"
+require_relative "../pip/pip"
 
 module VagrantPlugins
   module Ansible
@@ -6,17 +8,32 @@ module VagrantPlugins
         module RedHat
           module AnsibleInstall
 
-            def self.ansible_install(machine)
-              epel = machine.communicate.execute("#{yum_dnf(machine)} repolist epel | grep -q epel", :error_check => false)
-              if epel != 0
-                machine.communicate.sudo('sudo rpm -i https://dl.fedoraproject.org/pub/epel/epel-release-latest-`rpm -E %dist | sed -n \'s/.*el\([0-9]\).*/\1/p\'`.noarch.rpm')
+            def self.ansible_install(machine, install_mode, ansible_version)
+              if install_mode == :pip
+                pip_setup machine
+                Pip::pip_install machine, "ansible", ansible_version
+              else
+                ansible_rpm_install machine
               end
+            end
+
+            private
+
+            def self.ansible_rpm_install(machine)
+              rpm_package_manager = Facts::rpm_package_manager(machine)
 
-              machine.communicate.sudo("#{yum_dnf(machine)} -y --enablerepo=epel install ansible")
+              epel = machine.communicate.execute "#{rpm_package_manager} repolist epel | grep -q epel", error_check: false
+              if epel != 0
+                machine.communicate.sudo 'sudo rpm -i https://dl.fedoraproject.org/pub/epel/epel-release-latest-`rpm -E %dist | sed -n \'s/.*el\([0-9]\).*/\1/p\'`.noarch.rpm'
+              end
+              machine.communicate.sudo "#{rpm_package_manager} -y --enablerepo=epel install ansible"
             end
 
-            def self.yum_dnf(machine)
-              machine.communicate.test("/usr/bin/which -s dnf") ? "dnf" : "yum"
+            def self.pip_setup(machine)
+              rpm_package_manager = Facts::rpm_package_manager(machine)
+
+              machine.communicate.sudo("#{rpm_package_manager} -y install curl gcc libffi-devel openssl-devel python-crypto python-devel python-setuptools")
+              Pip::get_pip machine
             end
 
           end

data/plugins/provisioners/ansible/cap/guest/suse/ansible_install.rb

@@ -6,8 +6,12 @@ module VagrantPlugins
         module SUSE
           module AnsibleInstall
 
-            def self.ansible_install(machine)
-              machine.communicate.sudo("zypper --non-interactive --quiet install ansible")
+            def self.ansible_install(machine, install_mode, ansible_version)
+              if install_mode == :pip
+                raise Ansible::Errors::AnsiblePipInstallIsNotSupported
+              else
+                machine.communicate.sudo("zypper --non-interactive --quiet install ansible")
+              end
             end
 
           end

data/plugins/provisioners/ansible/cap/guest/ubuntu/ansible_install.rb

@@ -1,3 +1,4 @@
+require_relative "../debian/ansible_install"
 
 module VagrantPlugins
   module Ansible
@@ -6,12 +7,22 @@ module VagrantPlugins
         module Ubuntu
           module AnsibleInstall
 
-            def self.ansible_install(machine)
-              machine.communicate.sudo("apt-get update -y -qq")
-              machine.communicate.sudo("apt-get install -y -qq software-properties-common python-software-properties")
-              machine.communicate.sudo("add-apt-repository ppa:ansible/ansible -y")
-              machine.communicate.sudo("apt-get update -y -qq")
-              machine.communicate.sudo("apt-get install -y -qq ansible")
+            def self.ansible_install(machine, install_mode, ansible_version)
+              if install_mode == :pip
+                Debian::AnsibleInstall::ansible_pip_install machine, ansible_version
+              else
+                ansible_apt_install machine
+              end
+            end
+
+            private
+
+            def self.ansible_apt_install(machine)
+              machine.communicate.sudo "apt-get update -y -qq"
+              machine.communicate.sudo "apt-get install -y -qq software-properties-common python-software-properties"
+              machine.communicate.sudo "add-apt-repository ppa:ansible/ansible -y"
+              machine.communicate.sudo "apt-get update -y -qq"
+              machine.communicate.sudo "apt-get install -y -qq ansible"
             end
 
           end

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

@@ -74,34 +74,15 @@ module VagrantPlugins
             @errors << I18n.t("vagrant.provisioners.ansible.errors.no_playbook")
           end
 
-          if playbook
-            check_path_is_a_file(machine, playbook, "vagrant.provisioners.ansible.errors.playbook_path_invalid")
-          end
-
-          if inventory_path
-            check_path_exists(machine, inventory_path, "vagrant.provisioners.ansible.errors.inventory_path_invalid")
-          end
-
-          if galaxy_role_file
-            check_path_is_a_file(machine, galaxy_role_file, "vagrant.provisioners.ansible.errors.galaxy_role_file_invalid")
-          end
-
-          if vault_password_file
-            check_path_is_a_file(machine, vault_password_file, "vagrant.provisioners.ansible.errors.vault_password_file_invalid")
-          end
-
-          # Validate that extra_vars is either a hash, or a path to an existing file
+          # Validate that extra_vars is either a Hash or a String (for a file path)
           if extra_vars
             extra_vars_is_valid = extra_vars.kind_of?(Hash) || extra_vars.kind_of?(String)
             if extra_vars.kind_of?(String)
-              # Accept the usage of '@' prefix in Vagrantfile (e.g. '@vars.yml'
-              # and 'vars.yml' are both supported)
+              # Accept the usage of '@' prefix in Vagrantfile
+              # (e.g. '@vars.yml' and 'vars.yml' are both supported)
               match_data = /^@?(.+)$/.match(extra_vars)
               extra_vars_path = match_data[1].to_s
-              extra_vars_is_valid = check_path_is_a_file(machine, extra_vars_path)
-              if extra_vars_is_valid
-                @extra_vars = '@' + extra_vars_path
-              end
+              @extra_vars = '@' + extra_vars_path
             end
 
             if !extra_vars_is_valid
@@ -112,6 +93,17 @@ module VagrantPlugins
             end
           end
 
+          if raw_arguments
+            if raw_arguments.kind_of?(String)
+              @raw_arguments = [raw_arguments]
+            elsif !raw_arguments.kind_of?(Array)
+              @errors << I18n.t(
+                "vagrant.provisioners.ansible.errors.raw_arguments_invalid",
+                type:  raw_arguments.class.to_s,
+                value: raw_arguments.to_s)
+            end
+          end
+
         end
       end
     end

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

@@ -1,4 +1,5 @@
 require_relative "base"
+require_relative "../helpers"
 
 module VagrantPlugins
   module Ansible
@@ -8,12 +9,14 @@ module VagrantPlugins
         attr_accessor :provisioning_path
         attr_accessor :tmp_path
         attr_accessor :install
+        attr_accessor :install_mode
         attr_accessor :version
 
         def initialize
           super
 
           @install           = UNSET_VALUE
+          @install_mode      = UNSET_VALUE
           @provisioning_path = UNSET_VALUE
           @tmp_path          = UNSET_VALUE
           @version           = UNSET_VALUE
@@ -23,6 +26,7 @@ module VagrantPlugins
           super
 
           @install           = true                   if @install           == UNSET_VALUE
+          @install_mode      = :default               if @install_mode      == UNSET_VALUE
           @provisioning_path = "/vagrant"             if provisioning_path  == UNSET_VALUE
           @tmp_path          = "/tmp/vagrant-ansible" if tmp_path           == UNSET_VALUE
           @version           = ""                     if @version           == UNSET_VALUE
@@ -31,30 +35,13 @@ module VagrantPlugins
         def validate(machine)
           super
 
-          { "ansible local provisioner" => @errors }
-        end
-
-        protected
-
-        def check_path(machine, path, test_args, error_message_key = nil)
-          remote_path = Pathname.new(path).expand_path(@provisioning_path)
-          if machine.communicate.ready? && !machine.communicate.test("test #{test_args} #{remote_path}")
-            if error_message_key
-              @errors << I18n.t(error_message_key, path: remote_path, system: "guest")
-            end
-            return false
+          if @install_mode.to_s.to_sym == :pip
+            @install_mode = :pip
+          else
+            @install_mode = :default
           end
-          # when the machine is not ready for SSH communication,
-          # the check is "optimistically" by passed.
-          true
-        end
-
-        def check_path_is_a_file(machine, path, error_message_key = nil)
-          check_path(machine, path, "-f", error_message_key)
-        end
 
-        def check_path_exists(machine, path, error_message_key = nil)
-          check_path(machine, path, "-e", error_message_key)
+          { "ansible local provisioner" => @errors }
         end
 
       end