Commit Graph

10117 Commits

Author SHA1 Message Date
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
James Nugent b0b9d044b5 guests/smartos: Add/fix various guest capabilities
This commit adds a variety of fixes for SmartOS guest support:

- Host name setting now works in the global zone and in non-global zones
- NFS now works in the global zone and the non-global zone.
- Tests are updated and moved to the (apparently) more modern style
2017-06-16 17:00:50 -04: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
Richard Mayes 649fea13ff Detect the result of the has_vmcx_support properly
Fixes #8677
2017-06-13 18:20:48 +01:00
Brian Cain f3535e393e Update CHANGELOG 2017-06-12 09:41:13 -07:00
Brian Cain 6f21a19649 Merge pull request #8661 from briancain/6640/master/use-cipher-list-for-ssh-communicator
Use default cipher list for ssh communicator
2017-06-12 09:39:20 -07:00
Yufan Lou 3b63e1f8b8 Add chomp to lookup gid
Fixes #8664
2017-06-10 15:15:43 +08:00
Brian Cain 7a97f0a53e (#6640) Use default cipher list for ssh communicator
Prior to this commit, the ssh communicator would use the default cipher
list in Net::SSH to negociate which ciphers it should use between hosts.
Due to a bug in Net::SSH and the position of the `none` cipher in its
default cipher list, if a host supported the none cipher, but also
only supported other ciphers that came after none in the default list,
it would accept none and attempt to use that cipher instead of the other
supported ciphers. This commit fixes that behavior by copying the
default cipher list from Net::SSH and placing none last in the list so
that other ciphers can be used in the negotiation before attempting to
use the unsecure none cipher.
2017-06-09 17:18:15 -07:00
Brian Cain 2159957247 Update CHANGELOG 2017-06-09 08:36:59 -07:00
Harry Weppner 250e74cb79 fix check for `docker-compose` 2017-06-08 11:09:41 -07:00
Katie Bayes e2441dd4b7 fix update to middleman version 26 2017-06-07 17:12:14 -04:00
Brian Cain 378aae8782 Merge pull request #8653 from briancain/7188/master/unify-snapshot-restore-failures
Clean up vagrant snapshot restore/delete error messages
2017-06-07 11:47:38 -07:00
Brian Cain 43ae30cf9b Merge pull request #8651 from briancain/WARN-CWD-CHANGES
Warn about changes to cwd for every machine action
2017-06-07 11:46:57 -07:00
Brian Cain 87b7514603 (#7188) Clean up vagrant snapshot restore/delete error messages
This commit adds some better handling around the snapshot restore and
delete commands for the virtualbox provider. If a user attempts to restore from
a vm that does not exist, instead of exiting 0 it will raise an
exception saying the virtual machine has not been created yet.
Addtionally, if a user attempts to restore from a snapshot id that does
not exist, instead of printing a complicated exception from the
virtualbox cli tool, it prints a more useful error message telling the
user that the snapshot does not exist.
2017-06-07 09:12:20 -07:00
Katie Bayes cdd3cd1413 update middleman version from 22 to 26 2017-06-06 21:37:40 -04:00