haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,701 Commits 8 Branches 143 Tags 51 MiB
Commit Graph

8701 Commits

Author SHA1 Message Date
Seth Vargo 68329817ad Merge pull request #7290 from phyber/fix/master/prepare_nfs_settings_machine_ip_fix 
prepare_nfs_settings: Try harder to get all machine IPs.
 2016-05-27 18:38:03 -04:00
Seth Vargo ef22149e9c
Update CHANGELOG 2016-05-27 17:39:06 -04:00
Seth Vargo 8c11b537ba
Allow Mac/Windows users to use Docker native 2016-05-27 17:36:07 -04:00
Seth Vargo db1f98ffd6 Merge pull request #7298 from till/t/docker-for-mac-beta 
Change: disable the linux switch (Docker for Mac/Windows, etc.)
 2016-05-27 17:25:13 -04:00
Christian Hofstaedtler ba77d4b533
Allow Vagrant to work with newer Rubygems 
Fixes GH-7073
 2016-05-27 17:19:33 -04:00
Seth Vargo a4803c0869
Update CHANGELOG 2016-05-27 17:17:29 -04:00
Seth Vargo 171434bbf9 Merge pull request #7353 from mitchellh/sethvargo/package_preflight 
Move pre-flight package validation to middleware
 2016-05-27 17:16:40 -04:00
Seth Vargo a92d841e2a
Update CHANGELOG 2016-05-27 17:08:46 -04:00
Seth Vargo f313c89d74 Merge pull request #7059 from markpeek/markpeek-no-provision-on-resume 
Do not ignore the sentinal file when running resume
 2016-05-27 17:07:41 -04:00
Seth Vargo efdb148f61
Move pre-flight package validation to middleware 
This commit separates the scratch and output directory creation from the
main package middleware into its own PackageSetupFolders middleware.
Additionally, the validation that ensures an output file does not exist
is moved into a validation function that can be shared across multiple
methods.

This refactor permits a pre-flight check to ensure box packaging would
be successful before actually stopping the VM.

Fixes GH-7351
 2016-05-27 17:07:04 -04:00
Seth Vargo a735608787
Update CHANGELOG 2016-05-27 16:06:56 -04:00
Seth Vargo d9a4736e1c Merge pull request #7352 from mitchellh/sethvargo/24 
Bump box resume delay to 24h
 2016-05-27 16:05:27 -04:00
Seth Vargo 2a02ceb870
Bump box resume delay to 24h 
This commit bumps the box resume delay time to 24h and makes it a
constant because I had a bugger of a time actually finding this in the
code :frowny:.

Fixes GH-7272
 2016-05-27 15:18:50 -04:00
Seth Vargo f8439869e7 Merge pull request #7349 from kcvajgf/synced-folder-id 
Documentation for synced_folder's 'id' argument
 2016-05-27 09:57:07 -04:00
kcvajgf 368db4e933 Add documentation for synced_folder's 'id' argument 2016-05-27 20:43:01 +08:00
Seth Vargo 06135e3d6e Merge pull request #7347 from dmerrick/patch-1 
Fixing second paragraph indentation and link.
 2016-05-26 15:35:01 -04:00
Dana Merrick f7fa88fe8b Fixing second paragraph indentation and link. 2016-05-26 11:32:21 -07:00
Seth Vargo d35e7c43f0 Merge pull request #7339 from Apophenia/patch-1 
Fix typo in list of action hooks
 2016-05-23 19:43:31 -04:00
Lyndsey M c6bfb19e24 Fix typo in list of action hooks 
Fixes misspelled word in `machine_action_up` description: 'caled' to 'called'
 2016-05-23 19:12:58 -04:00
Seth Vargo a26742fc27 Merge pull request #7334 from annag42/patch-1 
Update up.html.md
 2016-05-21 10:24:53 -04:00
annag 87fd8beef8 Update up.html.md 
s/created and interacting with/created and interacted with/
for grammatical correctness (parallel construction).
 2016-05-20 18:58:43 -07:00
Seth Vargo ee492629ac
Update CHANGELOG 2016-05-20 10:46:49 -04:00
Seth Vargo 08550b6888 Merge pull request #7108 from jtopper/fix_hyperv_status_exception 
HyperV: Reinstate compatibility with PowerShell 4
 2016-05-20 10:46:01 -04:00
Seth Vargo b384ff98a5
Trailing comma 2016-05-19 11:35:53 -04:00
Seth Vargo 1571879a4b
Update CHANGELOG 2016-05-19 11:34:50 -04:00
Seth Vargo 4bdeeee793 Merge pull request #7327 from thommay/support_solo_legacy 
Support Chef Solo local + legacy modes
 2016-05-19 11:34:15 -04:00
Thom May 693d4dd5f1
Support Chef Solo local + legacy modes 
Signed-off-by: Thom May <thom@may.lt>
 2016-05-19 15:27:17 +01:00
Seth Vargo f6db93d4be
Update CHANGELOG 2016-05-16 12:07:41 -04:00
Seth Vargo 938f8f384d Merge pull request #7110 from jtopper/hyperv_snapshots 
Add snapshot support to Hyper-V provider
 2016-05-16 12:06:51 -04:00
Seth Vargo e3c327b977
Fix typo 
Fixes GH-7315
 2016-05-14 11:28:36 -04:00
Jon Topper 0a7c20a93a Determine status behaviour based on PS version 2016-05-13 17:50:24 +01:00
Jon Topper 82438da8a7 Add docs detailing the rollback limitations. 2016-05-13 17:28:33 +01:00
Jon Topper df4caf0757 Add snapshots to Hyper-V driver 2016-05-13 16:58:08 +01:00
David O'Rourke c5f975838d prepare_nfs_settings: Add spec test for static/dynamic IP combo 2016-05-10 11:40:16 +01:00
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
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
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
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