Commit Graph

7510 Commits

Author SHA1 Message Date
Seth Vargo 261ef836e0 Merge pull request #5702 from leocassarani/fix-missing-word
Add missing word to output of "vagrant up"
2015-05-11 11:04:52 -04:00
Leo Cassarani 217a00c36c Add missing word to output of "vagrant up"
Add the word "flag" to the phrase "or use the `--provision` flag", which
is displayed when "vagrant up" is run for a VM that's already been
provisioned.
2015-05-11 16:01:53 +01:00
Benjamin Staneck 7a94eba0b4 Port changes from pull request #5495 to the vb_5 module to fix #4815 here, too. 2015-05-09 02:03:33 +02:00
Joakim Bergman 2b3411965a virtualbox: handle a list of bridged nics
This change allows you to specify multiple network interfaces to bridge
to, picking the first found.

```ruby
config.vm.network "public_network",
  bridge: ["en4: Thunderbolt Ethernet",
           "en6: Broadcom NetXtreme Gigabit Ethernet Controller",
           "en0: Wi-Fi (AirPort)"]
```
2015-05-07 18:23:11 +02:00
Seth Vargo 1cf2a8db4c Update CHANGELOG 2015-05-06 14:07:27 -07:00
Seth Vargo 3b10a3165a Merge pull request #5495 from jfbibeau/windows_unc_paths
Proposed fix for #4815 - Windows UNC path to allow > 256 characters
2015-05-06 14:06:38 -07:00
c33s 37eb006c0b added favicon for www & doc 2015-05-06 00:12:42 +02:00
Taliesin Sisson 9233e22974 Use powershell syntax for Chef provisioner when using windows 2015-05-02 16:21:32 +01:00
Mikhail Zholobov 079e06cd09 box/package: Take only files while packaging the new box
Fixes GH-5657
2015-04-30 16:08:18 +03:00
Matthew Rahtz 29c77e5719 Escape/unescape cURL URLs/auth
so that we can deal with special characters in usernames and passwords
2015-04-29 14:34:00 +01:00
Benjamin Staneck 4d3e0cac62 Support Virtualbox 5.0 (beta) by adding a driver, referencing it in the list of acceptable versions/drivers, and autoloading the file in the virtualbox plugin file. 2015-04-28 17:53:48 +02:00
Ben Hines 9bbfbef977 Be a bit more robust when parsing environment.conf 2015-04-27 23:09:07 -07:00
Dave Mangot 25639ab6c2 fix master_config documentation 2015-04-26 12:25:36 -07:00
Paul Krohn c7f32e6159 When you can't find the salt minion or master config, say what you were looking for. 2015-04-26 11:34:34 -07:00
jaisubramani 4dd35802b6 Updated ssh docs 2015-04-25 17:22:10 -07:00
Brooks Brown a3fb92783e added gpg signature for rmv and bundle gem install to the documentation Vagrantfile 2015-04-23 17:31:57 -04:00
Brooks Brown cdd57b0be7 Added a note on PowerShell to prerequisites SMB documentation. 2015-04-22 17:06:08 -04:00
Tiago Mendes-Costa 36f89afbdf Added unit test for tinycore change_host_name. 2015-04-22 16:12:46 +02:00
Tiago Mendes-Costa c50199801b Merge pull request #1 from bmx0r/tinycore-changehostname
Removed useless line in TinyCore change_host_name.
2015-04-22 16:06:50 +02:00
bmx0r 883d01cdab Merge pull request #1 from bmx0r/bmx0r-patch-1
Remove useless line
2015-04-21 23:45:23 +02:00
bmx0r 0b588e3656 Remove useless line
/usr/bin/sethostname will change /etc/hostname, useless to do it twice
2015-04-21 21:04:40 +02:00
Tiago Mendes-Costa a9b8139755 Added change_host_name capability for tinycore. 2015-04-21 20:48:34 +02:00
Seth Vargo bdb945cd1b Merge pull request #5617 from jfbibeau/update-nfs-docs
[docs] Documenting more NFS options.
2015-04-21 10:58:28 -04:00
Jean-Francois Bibeau 744033aa17 Added a few undocumented NFS options. 2015-04-21 10:11:18 -04:00
Seth Vargo 6172bb5abe Update CHANGELOG 2015-04-20 18:17:57 -04:00
Seth Vargo 2c247824e1 Merge pull request #5612 from frapposelli/photon-guest-support
Add Guest support for VMware Photon.
2015-04-20 18:17:27 -04:00
Fabio Rapposelli 90bb760b3b Added tests
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-04-20 14:56:26 -07:00
Fabio Rapposelli 21db4470a0 Add Guest support for VMware Photon.
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-04-20 10:13:21 -07:00
James Shubin b16b85aa7d Add :name attribute to shell provisioner.
This allows the display of friendly output to the user when we think an
important action should be labeled a certain way. This makes vagrant
output a lot more useful when many inline shell provisioners are
present.
2015-04-18 00:35:21 -04:00
Haz 0962a2d151 Update ssh.rb to detect PLink v0.64
PLink 0.64 (released 28-2-2015) changes the command-line description, so the previous text-match no longer works.
2015-04-17 12:34:40 +10:00
Jean-Francois Bibeau 45e14a8dc4 UNC paths should have backslashes, not front-slashes. 2015-04-16 11:02:58 -04:00
Ben Hines 602227ca7d Remove debug spam from development. 2015-04-16 00:50:53 -07:00
Shawn Neal 27599ee897 Merge pull request #5593 from mitchellh/make-salt-bootstrap-idempotent
Salt bootstrap ps1 should be idempotent
2015-04-14 07:40:15 -07:00
Shawn Neal 9de3c481de Salt bootstrap ps1 should be idempotent
- WinRM communicator error detection was tightened up thus exposing an issue in the salt bootstrap script creating directories that already exist.
2015-04-14 05:57:16 -07:00
Peter Tripp ef45f7c52e Add documentation for salt bootstrap script config parameter. 2015-04-13 12:57:58 -07:00
Aaron Quint 2f81669394 Move shell_cmd to a method in SSH::Communicator
This allows shell_cmd to be overridable by plugins/patches without
having to override the entire (large) shell_execute method
2015-04-13 13:45:17 -04:00
Ben Hines ffcb58bcd9 When using environments, allow specifying the 'main manifest' using manifest_path and manifest_file. 2015-04-12 12:31:31 -07:00
Ben Hines 0efb9a3932 Fix resolution of puppet path for <4.0 2015-04-12 12:29:50 -07:00
Ben Hines b40426aca5 Properly parse out and use the environment's manifest file which is specified in environment.con. 2015-04-12 02:16:54 -07:00
Ben Hines c8f300e5f5 Correct environment path option to puppet apply. 2015-04-12 01:43:19 -07:00
Ben Hines c701bab253 Properly handle various combinations of Puppet options being specified. 2015-04-12 01:26:41 -07:00
Ben Hines cff7c52716 Use localized error message. Update strings for puppet provisioner errors. 2015-04-12 01:25:40 -07:00
Ben Hines 7a4e7929f8 Don't parse env metadata until provisioning time. TBD: make it functional 2015-04-12 01:18:49 -07:00
Ben Hines 3ee47acb42 Remove debug output 2015-04-12 01:18:12 -07:00
Ben Hines e2c68fc12d Correct environment path config name. 2015-04-11 23:48:18 -07:00
Ben Hines 3a2a9a3b94 Add a binary_path option to the puppet provisioner to match the chef provisioner, and support new puppet 4 install location. 2015-04-11 23:35:25 -07:00
Ben Hines cf847e0410 Merge branch 'master' into environments_wip
Conflicts:
	Vagrantfile
	vagrant.gemspec
2015-04-11 13:33:32 -07:00
Ben Hines e8843b8648 Merge branch 'master' of https://github.com/mitchellh/vagrant 2015-04-11 13:03:18 -07:00
Stoned Elipot 27f323ed5a Fix message provision / disabled_by_config 2015-04-11 14:32:05 +02:00
Brandon Matthews c0f43c362c Use service command to restart docker, not upstart.
upstart ships by default on Ubuntu, but not on Debian, and service works
everywhere. Fixes #5245.
2015-04-10 10:06:21 -07:00