Commit Graph

6189 Commits

Author SHA1 Message Date
Gilles Cornu a394d80254 provisioners/ansible: minor change in unit tests 2014-05-04 21:25:43 +02:00
Mitchell Hashimoto 88da89ada2 Merge pull request #3626 from glensc/patch-1
bin: do not overflow exit code
2014-05-04 09:06:51 -07:00
Elan Ruusamäe e7beb04c3e do not overflow exit code
see discussion here

ccc45ebd7a
2014-05-04 11:33:30 +03:00
Brian Pitts 9f62216f87 Remove check for nfs in config 2014-05-03 16:10:01 -05:00
Brian Pitts 4d90fdfec5 Check usability of nfs on host 2014-05-03 16:09:08 -05:00
Mitchell Hashimoto 51ffa4181c core: Show message when checksumming box [GH-3623] 2014-05-03 09:17:49 -07:00
Mitchell Hashimoto a0bc119ec7 website/docs: document NAT interface [GH-3619] 2014-05-02 20:18:22 -07:00
Mitchell Hashimoto a354c44ea8 Merge pull request #3616 from aspiers/virtualbox-networking-doc
website/docs: split off virtualbox networking into separate page
2014-05-02 15:30:47 -07:00
Mitchell Hashimoto 2f125ef8c8 Merge pull request #3618 from aspiers/box-format-doc-improvements
website/docs: box format doc improvements
2014-05-02 15:30:22 -07:00
Adam Spiers 3a386f8bde mention that the "url" can also be a file path 2014-05-02 22:10:40 +01:00
Adam Spiers af09b81759 distinguish more clearly between two types of box metadata
There are two types of box metadata, both in JSON format, so
we need to minimise the potential for confusion between them.
Renaming the component outside the box file to include the
word "catalog" makes it clear that this JSON document can
catalog potentially multiple boxes in one go.
2014-05-02 22:03:03 +01:00
Adam Spiers 0f8183426a reverse order of two box components
The metadata is optional whereas the box file is required, so it makes
sense to list the box file first.  It's also easier on the reader's
brain to start with the more obvious and easily understandable item
(which they'll probably be expecting to read about anyway) and save
the more surprising item till later.
2014-05-02 21:49:11 +01:00
Adam Spiers 606fc7a9e4 eliminate slightly confusing wording
It doesn't make sense to use the present tense when saying box files are
split into two components, when one of those components is the box file
and one is something else.

One better way of phrasing it would be to use the past tense: "Box files
were split into two separate components" but even that's not completely
correct, because the old format did not include the metadata JSON
document which is one of the new components.

So it's safer to just say that today there are two different components.
2014-05-02 21:38:25 +01:00
Adam Spiers 3ee1572e3c use monospace for technical terms where appropriate 2014-05-02 21:37:31 +01:00
Adam Spiers 84f7bbcf83 split off virtualbox networking into separate page
v2/networking/index.html.md encourages the reader to seek
provider-specific information under the documentation for the provider,
so for consistency, any virtualbox-specific networking info should be
placed there, not in the general networking section.
2014-05-02 21:32:41 +01:00
Mitchell Hashimoto 89dfac86c6 website/docs: virtualbox [GH-3609] 2014-05-02 10:02:38 -07:00
Mitchell Hashimoto ece9db1183 website/docs: update box format [GH-3613] 2014-05-02 10:00:17 -07:00
Mitchell Hashimoto 7fa3c35676 Update completion.sh 2014-05-02 09:50:51 -07:00
Mitchell Hashimoto 604ae6caa3 communicators/ssh: detect if config.ssh.shell is non-functional [GH-3040] 2014-05-01 21:35:02 -07:00
Mitchell Hashimoto 8db5e820dd Update net-ssh dep [GH-3605] 2014-05-01 21:19:21 -07:00
Mitchell Hashimoto a8d51a2452 providers/virtualbox: remove old print 2014-05-01 21:19:14 -07:00
Mitchell Hashimoto 5d006f65ea website/docs: don't need a static IP for NFS [GH-3608] 2014-05-01 21:15:45 -07:00
Mitchell Hashimoto 4a53b138a0 core: Allow insecure RubyGems for plugins [GH-3610] 2014-05-01 21:14:47 -07:00
Mitchell Hashimoto c7d23c70f0 Merge pull request #3607 from aspiers/maintiner-typo
fix "maintiner" typo
2014-05-01 17:43:34 -07:00
Adam Spiers b0cfed5ec6 fix "maintiner" typo 2014-05-02 01:42:14 +01:00
Teemu Matilainen fc7e57fcaf Update CHANGELOG 2014-05-02 01:50:20 +03:00
Teemu Matilainen 8e8a834640 Merge pull request #3604 from lamont-granquist/lcg/fix-prerelease-versions
fix chef version checking
2014-05-01 19:46:52 -03:00
Lamont Granquist 56a22db6e2 remove require 2014-05-01 15:34:34 -07:00
Lamont Granquist 2c9f83a690 fix chef version checking
the version checking here uses a function which is intended only
for chef cookbook versions, which must be x.y or x.y.z.  when fed
a legal chef prerelease version the prior code throws an exception:

[2014-05-01T22:08:01+00:00] FATAL: Configuration error Chef::Exceptions::InvalidCookbookVersion: '11.14.0.alpha.1' does not match 'x.y.z' or 'x.y'
[2014-05-01T22:08:01+00:00] FATAL:   /tmp/vagrant-chef-2/solo.rb:6:in `from_string'
[2014-05-01T22:08:01+00:00] FATAL: Aborting due to error in '/tmp/vagrant-chef-2/solo.rb'

since we only need to compare the major and minor version numbers a
simple #to_f sufficies for this test.

alternative, we could use Gem::Version here, but i didn't really see
the need to...
2014-05-01 15:26:34 -07:00
Fabio Rehm 1b698f6ce8 website/docs: Fix link to global-status command 2014-05-01 18:52:51 -03:00
Fabio Rehm d64c1f750c website/docs: Add missing `end` to "Run Once or Always" example 2014-05-01 18:50:51 -03:00
Mitchell Hashimoto 736b6b1674 Update CHANGELOG 2014-05-01 13:49:41 -07:00
Mitchell Hashimoto f6683ad016 website/docs: update slat docs 2014-05-01 13:49:12 -07:00
Mitchell Hashimoto c303f82170 Merge pull request #3603 from eykd/feature/colorize-salt-output
provisioner/salt: Add colorization and log_level support to salt provisioner.
2014-05-01 13:47:44 -07:00
deyk 567af495d4 Add colorization and log_level support to salt provisioner.
This commit adds two new options to the salt provisioner:

- `colorize`: controls color output. Defaults to no-color (present behavior).
- `log_level`: controls log level. Defaults to `debug` (present behavior).

Docs included!
2014-05-01 11:10:09 -07:00
Mitchell Hashimoto 744c9c9663 providers/docker: choose proper provider for host VM 2014-05-01 10:22:43 -07:00
Mitchell Hashimoto 3ef77d395b Update CHANGELOG 2014-05-01 10:19:51 -07:00
Mitchell Hashimoto 049e92056b Merge pull request #3600 from mitchellh/f-default-provider
Default Provider By Priority
2014-05-01 10:19:09 -07:00
Mitchell Hashimoto c5b3dbbf75 core: fix final test 2014-05-01 10:12:36 -07:00
Mitchell Hashimoto 169a829cd8 core: dup the provider options so we can't overwrite them 2014-05-01 10:06:03 -07:00
Mitchell Hashimoto 52bb68ba73 core: Fix some tests, revert a change 2014-05-01 10:03:49 -07:00
Mitchell Hashimoto 76e29b912f providers/docker: lower priority
We do this mostly because Docker is the only provider that using it
requires some amount of Docker-specific knowledge. VirtualBox, VMware,
etc. kind of "just work". It is not the likely case that someone does
a `vagrant up` and expects Docker, at this point.
2014-05-01 09:51:50 -07:00
Mitchell Hashimoto cca9bffa90 core: Can exclude providers 2014-05-01 09:50:35 -07:00
Mitchell Hashimoto ab9f91568e core: more intuitive logic around default providers 2014-05-01 09:46:40 -07:00
Mitchell Hashimoto ba6272cc48 Update tests 2014-05-01 09:41:59 -07:00
Mitchell Hashimoto a9dfb6b3bd core: default provider chosen by usability and prority 2014-05-01 09:40:52 -07:00
Mitchell Hashimoto 429bd73495 core: provider has default priority of 5 2014-05-01 09:26:36 -07:00
Mitchell Hashimoto b6a61d8922 Update CHANGELOG 2014-05-01 09:14:27 -07:00
Mitchell Hashimoto 2362e7d5f0 Merge pull request #3599 from mitchellh/deprecate-warnings-for-unused-halt-config-props
Display deprecation warning for unused halt config properties
2014-05-01 09:09:53 -07:00
Shawn Neal c99a1fb2ae Display deprecation warning for unused halt config properties
halt_timeout and halt_check_interval will be removed in the next version of Vagrant, 1.7.
2014-05-01 09:03:49 -07:00