Commit Graph

9976 Commits

Author SHA1 Message Date
Chris Roberts c5db5ea1c8 Update CHANGELOG 2017-06-23 14:02:51 -07:00
Chris Roberts 3e051ee185 Merge pull request #8706 from lookfwd/fix_bug_8705
Fixing vagrant ssh issue 8705 - vagrant ssh with docker provider failing
2017-06-23 14:01:34 -07:00
Brian Cain 238ac6c4e2 Update CHANGELOG 2017-06-22 13:56:42 -07:00
Brian Cain c4eb18eb1a Merge pull request #8707 from briancain/disable-double-config-loading
Disable loading identical Vagrantfile twice from same dir
2017-06-22 13:55:19 -07:00
Brian Cain 57427d28e7 Merge pull request #8702 from briancain/maint/fix-ssh-util-unit-tests
Fixup util/ssh unit tests
2017-06-22 13:54:57 -07:00
Brian Cain 4ac55df22e Merge pull request #8708 from briancain/add-box-info-docs
Add information about extra box info
2017-06-22 13:54:11 -07:00
Brian Cain eec20a6506 Add information about extra box info
This commit adds a new page to vagrants docs around supplying an
`info.json` file for vagrant boxes.
2017-06-22 13:45:05 -07:00
Brian Cain 774e19b152 Disable loading identical Vagrantfile twice from same dir
Prior to this commit, if a user set the env var VAGRANT_HOME to be the
same directory where the project home is, Vagrant would load that file
twice and merge its config. This caused various provisioner and other
provider blocks to unexpectedly run twice. This commit updates the
config loader to look and see if the `:root` and `:home` procs are
equal, and if so, removes the `:home` object so that it isn't loaded and
duplicated. This commit however does not prevent duplicate loading if an
identical Vagrantfile exists in the home and project dir if those
locations are different.
2017-06-22 09:04:21 -07:00
Dimitrios Kouzis-Loukas 34d8ffb9b2 Fixing vagrant ssh issue 8705
Fixing vagrant issue https://github.com/mitchellh/vagrant/issues/8705
2017-06-21 10:23:34 -04:00
Brian Cain d66122f84d Fixup util/ssh unit tests
This commit properly mocks out the ChildProcess library for testing the
`util/ssh` class when subprocess is enabled.
2017-06-20 16:43:11 -07:00
Chris Roberts 3e0ff14ecb Update CHANGELOG 2017-06-19 16:52:56 -07:00
Chris Roberts 8437dccca2 Merge pull request #8678 from caveman-dick/fixWindow2012R2Issue
Fixes #8677 - Detect the result of the has_vmcx_support.ps1 properly
2017-06-19 16:51:46 -07:00
Chris Roberts 8536619962 Update CHANGELOG 2017-06-19 16:46:04 -07:00
Chris Roberts b3365af4b8 Merge pull request #8666 from louy2/patch-1
Chomp lookup gid
2017-06-19 16:45:04 -07:00
Chris Roberts c5b3751a83 Properly handle exception raised when property does not exist 2017-06-19 14:04:57 -07:00
Brian Cain 09d9c7563a Merge pull request #8699 from briancain/maint/master/fix-cwd-warnings
Fix vagrant_cwd warnings
2017-06-19 13:28:00 -07:00
Brian Cain 1b4d7848bc Fix vagrant_cwd warnings
Prior to this commit, if a user ran a vagrant command within a subdir,
it would warn about the cwd changing which is not actually the case.
This commit adds an additional check to see if vagrant is being invoked
within a subdirectory so that it doesn't warn the user.
2017-06-19 13:05:26 -07:00
Chris Roberts a47fbdad1b Merge pull request #8694 from DAXaholic/fix-snapshot-subcmd-anchors
Use proper snapshot subcommand anchors
2017-06-19 09:56:37 -07:00
Aaron Kunz 6e2c6141d0 Use proper snapshot subcommand anchors 2017-06-16 20:43:12 +02:00
Yufan Lou b8bad54ad9 Fix nil case 2017-06-16 11:22:56 +08:00
Brian Cain 5333e60e2d Update CHANGELOG 2017-06-15 16:39:47 -07:00
Brian Cain fbda3af106 Merge pull request #8693 from briancain/7855/master/introduce-more-ssh-config-options
Introduce more ssh options for machines
2017-06-15 16:38:18 -07:00
Brian Cain b02f110cd8 (#7855) Introduce more ssh options for machines
This commit allows the user to configure two additional options that
were previously not configurable: Compression and DSAAuthentication.
Each config option is set as a boolean, and if left out of the config
will default to its previous behavior which is included and set to
"yes". If the user explicitly sets it to false, it will not be included
as an ssh option.
2017-06-15 16:29:53 -07:00
Chris Roberts 5b1e9f1c66 Update CHANGELOG 2017-06-15 16:02:30 -07:00
Chris Roberts d260fe7d38 Merge pull request #7865 from DavidWittman/7454-fix-salt-minion-id-config
Fix minion_id config for salt provisioner
2017-06-15 16:01:33 -07:00
Chris Roberts 3eca98acd8 Update CHANGELOG 2017-06-15 15:17:10 -07:00
Richard Gareau 056f837fed Do not use UNC path for Solaris guest on Windows 2017-06-15 15:15:39 -07:00
Chris Roberts 9c6ce3357e Merge pull request #8625 from brianknight10/box-prune-html
website: Improve CLI box options
2017-06-15 10:08:58 -07:00
Brian Knight 8b8ae6652e Merge changes from master 2017-06-15 10:16:25 -04:00
Chris Roberts 02d8f9c840 Update CHANGELOG 2017-06-14 16:56:00 -07:00
Chris Roberts 6906dbc558 Merge pull request #8467 from MartinNowak/patch-1
fix `config.ssh.keys_only = false` for ansible
2017-06-14 16:54:24 -07:00
Chris Roberts 0fbda64c3f Update CHANGELOG 2017-06-14 16:48:02 -07:00
Chris Roberts 12e63de542 Merge pull request #8553 from bdwyertech/kali
Add support for Kali Linux
2017-06-14 16:47:32 -07:00
Chris Roberts 74f8e0e43b Update CHANGELOG 2017-06-14 16:43:15 -07:00
Chris Roberts 60a438396f Merge pull request #8588 from aligenttimaslat/bugfix/rsync_mkdir_on_windows
Fix a problem when using rsync folders on windows clients
2017-06-14 16:41:36 -07:00
Chris Roberts ddb3205536 Merge pull request #8596 from tonynguyen68/patch-1
Update environmental-variables.html.md
2017-06-14 16:40:43 -07:00
Chris Roberts b35a8f0447 Merge pull request #8599 from vmelnik-ukraine/fix/master/boxes_doc_example
Fix #8598 : example in docs for box usage.
2017-06-14 16:38:19 -07:00
Chris Roberts 261e8acce3 Update CHANGELOG 2017-06-14 16:36:20 -07:00
Chris Roberts 3f8172d874 Merge pull request #8618 from jen20/smartos-guests
guests/smartos: Add/fix various guest capabilities
2017-06-14 16:33:46 -07:00
Chris Roberts 153fcd2ee8 Update CHANGELOG 2017-06-14 15:27:53 -07:00
Chris Roberts fe10b45cdb Merge pull request #8659 from HarryWeppner/docker-compose-check
fix `docker-compose` check on `PATH`
2017-06-14 15:24:25 -07:00
Chris Roberts 0f7443d65a Merge pull request #8647 from DAXaholic/fix-box-subcmd-anchors
Use proper box subcommand anchors
2017-06-14 15:23:51 -07:00
Chris Roberts 37b3fd346d Merge pull request #8654 from katiebayes/master
update middleman version from 22 to 26
2017-06-14 15:20:16 -07:00
Gilles Cornu ba66485f47 Update CHANGELOG
[ci skip]
2017-06-14 21:04:09 +02:00
Andreas Olsson f6a9dcdd6f Catch pip_args in FreeBSD's and SUSE's ansible_install
While neither the FreeBSD provisioner nor the SUSE provisioner support
installing Ansible using pip their ansible_install methods still get
called with that fourth argument. The result being these errors when
Vagrant tries to install Ansible.

    /opt/vagrant/embedded/gems/gems/vagrant-1.9.5/plugins/provisioners/ansible/cap/guest/freebsd/ansible_install.rb:10:in `ansible_install': wrong number of arguments (4 for 3) (ArgumentError)
    /opt/vagrant/embedded/gems/gems/vagrant-1.9.5/plugins/provisioners/ansible/cap/guest/suse/ansible_install.rb:9:in `ansible_install': wrong number of arguments (4 for 3) (ArgumentError)

The Arch provider, it too without pip support, already catches the
pip_args argument this way.
2017-06-14 21:01:44 +02:00
Brian Cain e697f2f9a5 Update CHANGELOG 2017-06-13 16:50:52 -07:00
Brian Cain a9be8e8a14 Merge pull request #8680 from briancain/7685/master/add-unique-id-to-provisioners
Add a unique identifier to provision objects
2017-06-13 16:48:17 -07:00
Brian Cain 3baa142e7c (#7685) Add a unique identifier to provision objects
Prior to this commit, Vagrant had no way internally to determine if a
provisioner object was unique if the `name` property was not set.
Because of this, when vagrant went to merge configs it would duplicate
an existing unnamed provisioner since it had no way of determining if a
user actually had added the same provisioner twice. This commit fixes
that by introducing an id which will default to `name` if its set, but
if not will be set by `SecureRandom.uuid`.
2017-06-13 15:46:14 -07:00
Justin Campbell 2a91b1e693 Merge pull request #8679 from mitchellh/website-vagrantcloud-migration-packer-pp
website: Packer box version should be variable
2017-06-13 17:17:53 -04:00
Justin Campbell 17691bac10 website: Packer box version should be variable
When using multiple builders, the post-processor could yield different results for the `{{timestamp}}` interpolation.

By using a variable instead, the version will be consistent across all builders.

https://github.com/hashicorp/packer/issues/4973
2017-06-13 17:09:41 -04:00