update changelog

CHANGELOG.md

@@ -28,11 +28,14 @@ IMPROVEMENTS:
   - commands/ssh: Inline commands specified with "-c" are now executed
     using OpenSSH rather than pure-Ruby SSH. It is MUCH faster, and
     stdin works!
+  - communicators/ssh: new configuration `config.ssh.pty` is a boolean for
+    whether you want ot use a PTY for provisioning.
   - providers/virtualbox: Enable symlinks for VirtualBox 4.1. [GH-2414]
   - providers/virtualbox: default VM name now includes milliseconds with
     a random number to try to avoid conflicts in CI environments. [GH-2482]
   - providers/virtualbox: customizations via VBoxManage are retried, avoiding
     VirtualBox flakiness [GH-2483]
+  - provisioners/ansible: allow files for extra vars [GH-2366]
   - provisioners/shell: Added `keep_color` option to not automatically color
     output based on stdout/stderr. [GH-2505]
   - synced\_folders/nfs: Specify `nfs_udp` to false to disable UDP based

plugins/provisioners/ansible/config.rb

@@ -66,14 +66,15 @@ module VagrantPlugins
           end
         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 path to an
+        # existing file
         if extra_vars
-          extra_vars_is_valid = (extra_vars.kind_of?(Hash) or extra_vars.kind_of?(String))
-
+          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)
-            extra_vars =~ /^@?(.+)$/
-            extra_vars_path = $1.to_s
+            # 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
             expanded_path = Pathname.new(extra_vars_path).expand_path(machine.env.root_path)
             extra_vars_is_valid = expanded_path.exist?
             if extra_vars_is_valid

plugins/provisioners/ansible/provisioner.rb

@@ -76,7 +76,8 @@ module VagrantPlugins
           # A JSON or YAML file is referenced (requires Ansible 1.3+)
           return config.extra_vars
         else
-          # Expected to be a Hash after config validation. (extra_vars as JSON requires Ansible 1.2+, while YAML requires Ansible 1.3+)
+          # Expected to be a Hash after config validation. (extra_vars as
+          # JSON requires Ansible 1.2+, while YAML requires Ansible 1.3+)
           return config.extra_vars.to_json
         end
       end