From fdcf53b56d94eab7f893c8829e48d5a083eb17ab Mon Sep 17 00:00:00 2001 From: michal Date: Mon, 4 Jan 2016 21:58:02 +0100 Subject: [PATCH 1/8] #6794 Add to doc trick how to define locale for SSH session in Vagrant file --- website/docs/source/v2/vagrantfile/tips.html.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/website/docs/source/v2/vagrantfile/tips.html.md b/website/docs/source/v2/vagrantfile/tips.html.md index c195e5084..5c84ec14a 100644 --- a/website/docs/source/v2/vagrantfile/tips.html.md +++ b/website/docs/source/v2/vagrantfile/tips.html.md @@ -47,3 +47,20 @@ every node will actually provision with the same text. This is an easy mistake to make, and Vagrant can't really protect against it, so the best we can do is mention it here. + +## Overwrite host locale in ssh session + +Usually, host locale environment variables are passed to guest. It may cause +failures when guest software do not support host locale + +Possible solution is override locale in Vagrant file: + +
+Vagrant.configure(2) do |config|
+  config.vm.box = "ubuntu/vivid64"
+  ENV['LC_ALL']="en_US.UTF-8"
+end 
+
+ +The change is visible within Vagrantfile only. + From e1a0b01e271810e4558c527614939dc18d4f3a41 Mon Sep 17 00:00:00 2001 From: Shawn Neal Date: Wed, 6 Jan 2016 13:37:28 -0800 Subject: [PATCH 2/8] Fix issue 6762 Fixes error "The term '$?' is not recognized as the name of a cmdlet, function, script" --- plugins/provisioners/puppet/provisioner/puppet.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb index ee7320559..cee8c1f48 100644 --- a/plugins/provisioners/puppet/provisioner/puppet.rb +++ b/plugins/provisioners/puppet/provisioner/puppet.rb @@ -230,7 +230,7 @@ module VagrantPlugins command = "#{facter} #{puppet_bin} apply #{options}" if config.working_directory if windows? - command = "cd #{config.working_directory}; if (`$?) \{ #{command} \}" + command = "cd #{config.working_directory}; if ($?) \{ #{command} \}" else command = "cd #{config.working_directory} && #{command}" end From 1d3dbce813f02be46fbefe38e23fb44cfd869b92 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Thu, 7 Jan 2016 15:29:29 -0500 Subject: [PATCH 3/8] Update README.md --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b03ca1f31..8d8fb99f0 100644 --- a/README.md +++ b/README.md @@ -53,13 +53,11 @@ Ruby 2.0 is needed. ## Contributing to Vagrant -### Dependencies and Unit Tests +To install Vagrant from source, please [follow the guide in the Wiki](https://github.com/mitchellh/vagrant/wiki/Installing-Vagrant-from-Source). -To hack on Vagrant, you'll need [bundler](https://github.com/bundler/bundler) which can -be installed with a simple `gem install bundler`. Afterwards, do the following: +You can run the test suite with: - bundle install - rake + bundle exec rake This will run the unit test suite, which should come back all green! Then you're good to go! From dd88edaeafc5564363fd9f0ba6625a67193174e9 Mon Sep 17 00:00:00 2001 From: Anatol Pomozov Date: Fri, 8 Jan 2016 09:47:05 -0800 Subject: [PATCH 4/8] Specify gem license --- vagrant.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/vagrant.gemspec b/vagrant.gemspec index 078add344..afd59e075 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -8,6 +8,7 @@ Gem::Specification.new do |s| s.authors = ["Mitchell Hashimoto", "John Bender"] s.email = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"] s.homepage = "http://vagrantup.com" + s.license = 'MIT' s.summary = "Build and distribute virtualized development environments." s.description = "Vagrant is a tool for building and distributing virtualized development environments." From 0c4a623beebc9f0cb32b1f756c0571833e8418b2 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Sun, 10 Jan 2016 18:07:51 -0600 Subject: [PATCH 5/8] Clarify different channel types for Chef Fixes GH-6767 --- website/docs/source/v2/provisioning/chef_common.html.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/website/docs/source/v2/provisioning/chef_common.html.md b/website/docs/source/v2/provisioning/chef_common.html.md index 48d3f12cf..40224936b 100644 --- a/website/docs/source/v2/provisioning/chef_common.html.md +++ b/website/docs/source/v2/provisioning/chef_common.html.md @@ -41,7 +41,11 @@ their purpose. "chefdk", which will install the Chef Development Kit. - `channel` (string) - The release channel from which to pull the Chef Client - or the Chef Development Kit. The default value is `"current"`. + or the Chef Development Kit. The default value is `"current"` which will pull + ChefDK and the latest released version of Chef. For older versions, you may + need to change the channel to "stable". Because Chef Software floats the + versions that are contained in the channel, they may change and Vagrant is + unable to detect this. - `version` (string) - The version of Chef to install on the guest. If Chef is already installed on the system, the installed version is compared with the From 5c25b8f5694025ae877d32e15798e59e44cc6408 Mon Sep 17 00:00:00 2001 From: adamenger Date: Mon, 11 Jan 2016 00:04:34 -0600 Subject: [PATCH 6/8] Unfortuantely -> Unfortunately spelling fix --- website/www/source/vmware/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/www/source/vmware/index.html.erb b/website/www/source/vmware/index.html.erb index 8e43d852a..74b4d30f1 100644 --- a/website/www/source/vmware/index.html.erb +++ b/website/www/source/vmware/index.html.erb @@ -327,7 +327,7 @@ page_title: "VMware Vagrant Environments" We do offer a 50% discount off the purchase of the other Vagrant plugin for individual users and qualified candidates. Certain restrictions do apply. Please email support - to find out if you qualify. Unfortuantely we cannot retroactively + to find out if you qualify. Unfortunately we cannot retroactively apply this discount, so please email support before making your purchase.

From 54aa2f640a8212ec13c737731c7f701b1bb2845d Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Tue, 12 Jan 2016 14:10:21 -0500 Subject: [PATCH 7/8] Grammar --- website/docs/source/v2/vagrantfile/tips.html.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/website/docs/source/v2/vagrantfile/tips.html.md b/website/docs/source/v2/vagrantfile/tips.html.md index 5c84ec14a..b7b3e1149 100644 --- a/website/docs/source/v2/vagrantfile/tips.html.md +++ b/website/docs/source/v2/vagrantfile/tips.html.md @@ -50,17 +50,16 @@ so the best we can do is mention it here. ## Overwrite host locale in ssh session -Usually, host locale environment variables are passed to guest. It may cause -failures when guest software do not support host locale - -Possible solution is override locale in Vagrant file: +Usually, host locale environment variables are passed to guest. It may cause +failures if the guest software do not support host locale. One possible solution +is override locale in the `Vagrantfile`: 
+ENV["LC_ALL"] = "en_US.UTF-8"
+
 Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/vivid64"
-  ENV['LC_ALL']="en_US.UTF-8"
-end 
+  # ...
+end
-The change is visible within Vagrantfile only. - +The change is only visible within the `Vagrantfile`. From 9dbdb9397a92d4fc489e9afcb022621df7f60d11 Mon Sep 17 00:00:00 2001 From: Daniel Schreiber Date: Wed, 13 Jan 2016 23:05:39 +0100 Subject: [PATCH 8/8] fixing incorrect missing ansible error At least for ansible 2.0.0.1 the command `ansible-galaxy --help` is inappropriate for testing if ansible is installed, as it yields an error: ``` vagrant@vagrant-ubuntu-trusty-64:~$ ansible-galaxy --help && echo "OK" Usage: ansible-galaxy [delete|import|info|init|install|list|login|remove|search|setup] [--help] [options] ... Options: -h, --help show this help message and exit -v, --verbose verbose mode (-vvv for more, -vvvv to enable connection debugging) --version show program's version number and exit ERROR! Missing required action ``` --- plugins/provisioners/ansible/provisioner/guest.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/provisioners/ansible/provisioner/guest.rb b/plugins/provisioners/ansible/provisioner/guest.rb index 833fbfc8b..741b07301 100644 --- a/plugins/provisioners/ansible/provisioner/guest.rb +++ b/plugins/provisioners/ansible/provisioner/guest.rb @@ -52,7 +52,7 @@ module VagrantPlugins # Check that ansible binaries are well installed on the guest, @machine.communicate.execute( - "ansible-galaxy --help && ansible-playbook --help", + "ansible-galaxy info --help && ansible-playbook --help", :error_class => Ansible::Errors::AnsibleNotFoundOnGuest, :error_key => :ansible_not_found_on_guest)