Commit Graph

8827 Commits

Author SHA1 Message Date
David O'Rourke 985f1d4dda prepare_nfs_settings: Fix add_ips_to_env!, spec test passes again. 2016-05-10 11:16:21 +01:00
Seth Vargo c4fab86752 Merge pull request #7299 from tiemevanveen/patch-1
Added 'vagrant reload' info on collision_error
2016-05-10 11:58:44 +02:00
Tieme van Veen b8ca105602 Added 'vagrant reload' info on collision_error 2016-05-10 10:56:22 +02:00
till 647bd6114c Change: disable the linux switch (Docker for Mac/Windows, etc.) 2016-05-08 21:35:12 +02:00
Eric Pulvino 45e52e3bf1 Updated ./plugins/providers/virtualbox/driver/base.rb file, set max_network_adapters to 36 for Virtualbox so all 36 adapters are cleared prior to programming interfaces. This fix is per issue 7286 --> https://github.com/mitchellh/vagrant/issues/7286 2016-05-08 00:11:22 -04:00
David O'Rourke ed708645b2 prepare_nfs_settings: Try harder to get all machine IPs.
Vagrant was not behaving correctly in configurations where there was
a static IP on a VirtualBox `intnet` interface and a DHCP `:hostonly`
interface configured.

Since `machine_ip` attempted to get static addresses `||` dynamic
addresses, it would simply use the static machine address and
continue.

This commit corrects this behaviour by collecting all static and
dynamic addresses into the `machine_ip` array instead of just one or
the other.

The result of this is a correctly generated `/etc/exports` on the
host machine, allowing NFS mounts to work correctly in this type of
environment.
2016-05-05 14:41:03 +01:00
Seth Vargo 788bd557c4 Merge pull request #7283 from hedinfaok/patch-1
Adds instructions concerning Bundler versions
2016-05-04 13:16:33 -05:00
Rob Eden d3fc42c0b2 Fixes incorrect preposition 2016-05-04 14:11:31 -04:00
Rob Eden b1e8506ab0 Replaces Bundler details with Wiki link 2016-05-04 14:08:35 -04:00
Kierran McPherson 4afe0478b8 Fix broken test; Add explicit test
Hopefully the explicit test will prevent this from being regressed again in the future
2016-05-04 17:26:46 +12:00
Kierran McPherson 3bff55034a kernel/v2: Reimplement 8655d21 to always forward SSH
Fixes #7202
Always forwards SSH even if WinRM is set
2016-05-04 17:26:44 +12:00
Rob Eden eed574b311 Adds instructions concerning Bundler versions
Because Vagrant requires certain versions of Bundler in order to work properly, the correct version of Bundler must be installed manually.  I gathered this information from a couple of sources.

It's handy to have this information in this specific guide :)
2016-05-03 18:06:18 -04:00
Seth Vargo f19e33524d
Enable enhanced link tracking 2016-05-02 15:49:59 -04:00
Ryan Heffernan d7714f058d Added basic unit test 2016-04-30 13:22:52 -07:00
Ryan Heffernan 76e3ad988f Adding static IPv6 address support for Fedora 2016-04-30 12:27:48 -07:00
Gilles Cornu cdafc63a61 Docs: Fix statements about the ansible.cfg lookup
Related to GH-7195

[ci skip]
2016-04-24 20:27:23 +02:00
Gilles Cornu cf908d35e0 provisioners/ansible_local: Run galaxy from `provisioning_path` directory
Since it is now possible to specify some Galaxy settings in an
`ansible.cfg` file, it makes sense to run `ansible-galaxy` from the
same working directory as `ansible-playbook` execution does.

See http://docs.ansible.com/ansible/intro_configuration.html#galaxy-settings
2016-04-24 00:26:59 +02:00
Seth Vargo df231f2704 Merge pull request #7251 from mitchellh/sethvargo/referrer
Do not allow referrer modification
2016-04-22 23:26:29 -04:00
Seth Vargo 1eefad649b
Do not allow referrer modification
http://mathiasbynens.github.io/rel-noopener/
2016-04-22 23:24:42 -04:00
Gilles Cornu 327392d0fb Fix a CHANGELOG entry
[ci skip]
2016-04-21 00:37:31 +02:00
Gilles Cornu afb9af1549 Update CHANGELOG
[ci skip]
2016-04-21 00:34:19 +02:00
Gilles Cornu b6a3f0e8f1 Merge pull request #7103 from mitchellh/gildegoma/fix-6726
ansible_local: use double quoting for 'extra-vars', 'limit' and 'start-at-task' options (except if defined via `raw_arguments` option)
2016-04-21 00:29:43 +02:00
Gilles Cornu b2286388f0 provisioners/ansible: add basic config validators
With this change, the `raw_arguments` and `raw_ssh_args` options are:
- STILL automatically converted as an Array when they are set a String
  (no behaviour change)
- rejected if they are not of Array data type otherwise

Additional Notes:
- the 'as_array' tiny helper has been removed since it was no longer
  used.
- there is for now no deeper validation (i.e. verifying that the Array
  elements are only *String* objects)
2016-04-20 23:54:19 +02:00
Gilles Cornu ab036ddd0b provisioners/ansible: don't format raw_arguments
With cb80286a4a, the helper function
stringify_ansible_playbook_command was also applied on the
`raw_arguments` content, which is not wanted. Given that users have used
the `raw_arguments` option as a workaround to avoid the bug GH-6726,
this new change ensure that any `--extra-vars` option passed as a raw
argument won't be additonally enquoted by the ansible_local
provisioner.

This change also improves the ansible remote provisioner verbose output,
but has no impact on its behaviour, which was already correct.

Note that this refactoring introduces some code duplications that are not
very elegant (see ansible_playbook_command_for_shell_execution in
host.rb and execute_ansible_playbook_from_host in base.rb). I hope we
can find a better implementation later, but it is good enough for now
since all these parts are covered by corresponding unit tests (the
`ansible_local` stuff being tested via the verbose output of the ansible
remote provisioner).
2016-04-20 23:50:42 +02:00
Seth Vargo e04bce8607 Merge pull request #7239 from nickbyfleet/master
Fixed typo: incorrect key name for environment_path option.
2016-04-18 15:13:56 +05:30
Nicholas Byfleet cdb62d7977 Fixed typo: incorrect key name for environment_path option. 2016-04-18 16:16:57 +12:00
Seth Vargo 2c553290b8
Update CHANGELOG 2016-04-17 23:15:31 +05:30
Seth Vargo 6c01aaf6ab Merge pull request #7090 from mac2000/master
hyperv differencing disk
2016-04-17 23:14:29 +05:30
Seth Vargo 5728a7fe5d Update website deploy script 2016-04-12 20:10:57 +01:00
Seth Vargo 1df4060c49 Merge pull request #7223 from tKammy/update_bash_completion
update bash completion(snapshot)
2016-04-10 09:47:07 -04:00
Kammy 67c4de3b81 update bash completion(snapshot) 2016-04-10 12:44:01 +09:00
Seth Vargo 4157082bf3 Add more examples of installing local plugins 2016-04-08 10:38:25 -04:00
Seth Vargo bfac44aded Update CHANGELOG 2016-04-08 10:22:54 -04:00
Seth Vargo 2cabecbe7d Merge pull request #7219 from mitchellh/sethvargo/warn_envvar
Print a warning when token and envvar are set
2016-04-08 10:20:40 -04:00
Seth Vargo 2d0943b0ad Print a warning when token and envvar are set
Fixes GH-7206
2016-04-08 10:16:10 -04:00
Seth Vargo 42c5d98f60 Merge pull request #7216 from mitchellh/phinze/website-mime-types
website: force mime-types for some assets on deploy
2016-04-07 15:42:48 -04:00
Paul Hinze d104e33fa9 website: force mime-types for some assets on deploy
Should fix occassional issues with application/octet-stream mime type
assets breaking things on the site.
2016-04-07 12:49:45 -05:00
Seth Vargo cdb9006654 Merge pull request #7215 from AdamGelder/patch-1
Updated configuration.html.md Typo
2016-04-07 09:30:16 -04:00
AdamGelder 39794c6938 Updated configuration.html.md Typo 2016-04-07 09:37:20 +01:00
Seth Vargo 0344de7282 Add a section on accessing finalized config 2016-04-06 08:10:41 -04:00
Seth Vargo 9c0a4bb562 Update CHANGELOG 2016-04-05 10:46:48 -04:00
Seth Vargo bc74cb4008 Merge pull request #7158 from mitchellh/sethvargo/auth_metadata
Authenticate metadata box urls
2016-04-05 10:46:01 -04:00
Seth Vargo be9a88d2a0 Update CHANGELOG 2016-04-05 10:42:58 -04:00
Seth Vargo 7d98dd2526 Merge pull request #7184 from mitchellh/sethvargo/rescue_conn
Rescue Errno::ENOTCONN
2016-04-05 10:40:38 -04:00
Seth Vargo 45cc01e6a9 Merge pull request #7204 from johnmccabe/fix/osxuninstall
fix path in OSX vagrant uninstallation steps
2016-04-05 10:07:03 -04:00
John McCabe c5159e178c fix path in OSX vagrant uninstallation steps 2016-04-05 11:52:09 +01:00
Seth Vargo 88fd100011 Merge pull request #7203 from coddingtonbear/master
Minor grammar/spelling error in Environment Variables.
2016-04-04 22:14:54 -04:00
Adam Coddington c0ddf346c8 Minor grammar/spelling error in Environment Variables. 2016-04-04 17:55:59 -07:00
Seth Vargo 7df3e1bfb1 Merge pull request #7191 from ondine/patch-1
Exit the SSH session before vagrant destroy
2016-04-01 00:18:24 +02:00
ondine 8de78f5c5f Exit the SSH session before vagrant destroy
How to exit the session: http://superuser.com/questions/704032/how-to-exit-ssh-of-vagrant-in-terminal
2016-03-31 11:36:16 -07:00