Commit Graph

9951 Commits

Author SHA1 Message Date
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
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
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
Brian Cain 79c7799fd9 Add basic unit test for CWD change warning 2017-06-06 08:38:03 -07:00
Brian Cain d02189530d Merge pull request #8643 from briancain/6827/master/introduce-tty-flag-for-ssh-command
Introduce tty flag for ssh command execution
2017-06-06 08:35:07 -07:00
Fernando Seror 48b0e00368 Tests regarding warning whenever CWD changes 2017-06-05 13:25:30 -07:00
Fernando Seror 15871a481b Warn about changes to CWD on every machine action
Whenever the path where the machine was first created changes, Vagrant
will now show just one warning when an action is run on the machine.

The idea is that if a user copies the machine over to a different
directory with the idea of running two different machines, this warning
will now help the user determine how to make that work.
2017-06-05 13:25:30 -07:00
Aaron Kunz 78e16a7d10 Use proper box subcommand anchors 2017-06-05 14:18:10 +02:00
Brian Cain 1ade699936 (#6827) Introduce tty flag for ssh command execution
Prior to this commit, if a user ran the `vagrant ssh -c CMD` command, it
would not allow the user to configure pseudo-terminal allocation. This
commit introduces a -t flag for the `vagrant ssh` command which defaults
to true if not specified.
2017-06-02 17:32:02 -07:00
Brian Cain 875aee3636 Merge pull request #8632 from gtbono/fix_typo_link
Fixes typo in broken link to documentation
2017-06-01 09:08:11 -07:00
Brian Cain d0f1f39fa6 Merge pull request #8636 from briancain/7118/master/handle-invalid-box-names
Handle box names that are URLs
2017-05-31 16:16:38 -07:00
Brian Cain 5c7ee0bc2a Merge pull request #8627 from briancain/maint/master/raise-exception-snapshot-unsupported
Raise exception for unsupported snapshot providers and improve snapshot plugin testing
2017-05-31 16:16:23 -07:00
Brian Cain f1d08aa629 (#7118) Handle box names that are URLs
Prior to this commit, if a user set a URL for the name of a box, vagrant
would not warn the user about using box_url instead. This would lead to
some difficult user experiences around the various box commands due to
the box name being a full URL. This commit introduces a warning to the
user and lets them know to instead use box_url.
2017-05-31 15:25:05 -07:00
Brian Cain 65eb6d8c82 Merge pull request #8633 from mwhooker/patch-1
docs: add closing `
2017-05-31 14:58:47 -07:00
Matthew Hooker c8a45d9d17 add closing ` 2017-05-31 12:27:05 -07:00
Giovanni Tempobono 68b01d4288 Fixes typo in broken link to documentation 2017-05-31 14:40:06 +00:00