Commit Graph

4901 Commits

Author SHA1 Message Date
Mitchell Hashimoto 8bd073f08a website/docs: use string instead of symbol 2014-02-04 11:01:04 +01:00
Mitchell Hashimoto a2daa9851c Merge pull request #2931 from rmccue/patch-1
website/docs: Add documentation on DHCP for private networking
2014-02-04 02:00:29 -08:00
Teemu Matilainen a9337aba22 guests/{free,net}bsd: add `insert_public_key` capability
Copy the cap to missing *bsd variants.
2014-02-04 01:09:29 -03:00
Teemu Matilainen ca56c913aa kernel/v2: fix provisioner config with blocks
Regression from 10d5416.
2014-02-04 00:51:01 -03:00
Ryan McCue a99a75a2c7 Add documentation on DHCP for private networking 2014-02-04 12:35:13 +10:00
Teemu Matilainen e5f3f1ffe3 Merge pull request #2892 from tmatilai/openbsd
OpenBSD is not a Linux derivative
2014-02-03 18:27:23 -08:00
Teemu Matilainen 3b5d6c65fd guests/openbsd: Ensure that `PKG_PATH` is set when installing rsync
Depending on the shell, `PKG_PATH` is not necessarily set when Vagrant
runs `pkg_add`.

Ref: GH-2917
2014-02-03 23:17:54 -03:00
Mitchell Hashimoto bc7496d21c Merge pull request #2930 from danielbachhuber/fix-typo
core: fix typo in sentence
2014-02-03 13:35:34 -08:00
Mitchell Hashimoto f36cf2df21 Update CHANGLEOG 2014-02-03 22:34:46 +01:00
Mitchell Hashimoto 62c33c008e Merge pull request #2929 from mitchellh/f-provisioner-id
Provisioner Inheritance/Overriding

This allows provisioners to be overridden by sub-scopes (machine configs, provider overrides), allowing common provisioning to be put into the global scope and selectively overriding certain configurations. This allows for getting rid of a lot of duplication without having to know a lot of Ruby.

Completely documenting in the pull request (in website/docs commits), so read there.
2014-02-03 13:32:36 -08:00
Mitchell Hashimoto feeaa69615 kernel/v2: finalize the provisioner configs 2014-02-03 22:28:41 +01:00
Mitchell Hashimoto 59d257f832 provisioners/puppet: mergeable config 2014-02-03 22:27:23 +01:00
Mitchell Hashimoto d864187b1a provisioners/docker: configuration is mergeable 2014-02-03 22:23:26 +01:00
Daniel Bachhuber 8def6bf07f Fix typo in sentence 2014-02-03 13:10:28 -08:00
Mitchell Hashimoto 2cc56119b7 kernel/v2: support the preserve_order option (documented) 2014-02-03 22:03:20 +01:00
Mitchell Hashimoto 8603aeb2b9 website/docs: document it 2014-02-03 21:56:41 +01:00
Mitchell Hashimoto 3aaa57cac9 kernel/v2: support merging properly 2014-02-03 21:30:01 +01:00
Mitchell Hashimoto 10d5416a90 kernel/v2: support overriding provisioner settings 2014-02-03 16:56:39 +01:00
Mitchell Hashimoto debc14f883 kernel/v2: more tests 2014-02-03 16:42:47 +01:00
Mitchell Hashimoto 0e5840a14d kernel/v2: test for some config 2014-02-03 16:40:02 +01:00
Mitchell Hashimoto 38c2a48ff4 provisioners/docker: always pull images [GH-2901] 2014-02-03 16:26:38 +01:00
Mitchell Hashimoto 1d69e95c1c provisioners/docker: config to disablize -d flag 2014-02-03 16:14:59 +01:00
Teemu Matilainen c11820c848 guests/openbsd: Add back `insert_public_key` cap
Copied from linux guest.
2014-02-03 08:29:54 -03:00
Teemu Matilainen 767f147469 guests/openbsd: OpenBSD is not a Linux derivative 2014-02-03 08:27:57 -03:00
Mitchell Hashimoto b89a47c955 hosts/opensuse: start NFS server properly [GH-2923] 2014-02-03 12:18:09 +01:00
Mitchell Hashimoto d8df98a18c website/docs: note that rsync will be automatically installed 2014-02-03 12:14:41 +01:00
Mitchell Hashimoto f63ef395f1 Merge branch 'rsync_install' of https://github.com/tmatilai/vagrant into tmatilai-rsync_install
Conflicts:
	plugins/guests/freebsd/plugin.rb
	plugins/guests/netbsd/plugin.rb
	plugins/guests/openbsd/plugin.rb
2014-02-03 12:12:49 +01:00
Mitchell Hashimoto 3c10bf7721 communicators/ssh: better error message 2014-02-03 12:09:13 +01:00
Mitchell Hashimoto c1e18325ca Merge pull request #2907 from justincampbell/scp-error-path
provisioners/file: Fix wording of upload permission error
2014-02-03 03:07:36 -08:00
Mitchell Hashimoto 6ad1802a09 update CHANGELOG 2014-02-03 12:06:29 +01:00
Mitchell Hashimoto 56e85bc989 Merge pull request #2906 from frosario/cable_connected
providers/virtualbox: connect cable for bridged networking
2014-02-03 03:05:16 -08:00
Mitchell Hashimoto ac439852ff kernel/v2: allow IPs to end in ".1" [GH-2914] 2014-02-03 12:02:14 +01:00
Mitchell Hashimoto 592c577b2e Merge pull request #2922 from tmatilai/file_provisioner_expand_path
provisioners/file: expand destination path if capable
2014-02-03 02:52:57 -08:00
Mitchell Hashimoto 8ee7fa470f Merge pull request #2925 from fgrehm/ensure-synced-folder-types-are-symbols
kernel/v2: Make sure synced folder types are always symbols internally
2014-02-03 02:50:59 -08:00
Teemu Matilainen 023d3115dd guests/{free,net,open}bsd: Add `shell_expand_guest_path` capability 2014-02-02 17:38:24 -03:00
Teemu Matilainen e634cdc824 guests: rename LinuxShellExpandFailed error to ShellExpandFailed
Make the error generic for all guests (`DarwinShellExpandFailed` didn't
even exist) and not tied to synced folder.
2014-02-02 17:26:54 -03:00
Mitchell Hashimoto 07389f26ed core: Force bundler usage if in Installer 2014-02-02 20:32:39 +01:00
Mitchell Hashimoto 6ec71d4a85 Make version 1.5.0.dev for semver
/cc @tmatilai - I modified the vagrant-installers to strpi this.
2014-02-02 16:52:41 +01:00
Mitchell Hashimoto 3ed7b2618a Add new version.txt used to generate installers 2014-02-02 15:33:12 +01:00
Fabio Rehm dd9d20af88 Make sure synced folder types are always symbols
This will make sure that plugins that define synced folders after this
config object has been finalized won't have trouble because of
forgetting to use symbols instead of strings.

References https://github.com/fgrehm/vagrant-cachier/issues/76
2014-02-01 16:01:05 -02:00
Mitchell Hashimoto bc55081e9f core: execute the specified Vagrant executable in pre-rubygems.rb 2014-02-01 16:28:45 +01:00
Teemu Matilainen bc96a054be provisioners/file: add unit tests for the provisioner 2014-02-01 01:23:57 -03:00
Teemu Matilainen b52958bfb6 provisioners/file: expand destination path if capable 2014-02-01 01:23:09 -03:00
Teemu Matilainen 9771c8bd52 provisioners/file: Add unit tests for the config 2014-02-01 01:22:53 -03:00
Mitchell Hashimoto 24a03de8bf core: Only load default and plugin Bundler groups to avoid dev deps 2014-01-31 16:42:53 +01:00
Teemu Matilainen ee2ae94c25 synced_folders/rsync: Install `rsync` on guest if needed
Add new `rsync_installed` and `rsync_install` guest capabilities
to detect and install `rsync`.

Also copy `rsync_pre` capability to all Unix guests.
2014-01-31 02:12:57 -03:00
Justin Campbell a633b7343a Fix wording of upload permission error
SCPPermissionDenied expects a path, and this is most likely the
destination (to) and not source (from).

[#2804]
2014-01-28 13:49:14 -05:00
Freddie Rosario ccf14bb398 Applying bugfix for cableconnected issue to earlier releases of virtualbox 4.x series 2014-01-28 11:05:44 -05:00
Freddie Rosario cd0c7dfbd9 Bugfix for github issue 2890.
Changing default behavior of vagrant up to enable "cableconnected" on bridged network devices
2014-01-28 10:54:39 -05:00
Mitchell Hashimoto 8cc7d00314 website/docs: fix typo [GH-2876] 2014-01-27 09:39:04 -08:00