Commit Graph

1704 Commits

Author SHA1 Message Date
Ryan Gibbons a11e99cdae Switch to using ifconfig <device> down instead of ifdown. ifdown will return non-zero status if device failed to get IP during dhcp. 2012-01-18 11:04:54 -08:00
Ryan Gibbons cc94f1ee2c making the same ifdown -> ifconfig change for debian 2012-01-18 11:02:35 -08:00
Mitchell Hashimoto 3ab8aaa1b0 Clarify invalid log level message [GH-645] 2012-01-18 09:40:51 -08:00
Frank Luithle f3038a4033 Fix 'box help' subcommand for Ruby 1.8.7
This is related to Github issue #599, with a similar fix.
2012-01-18 12:23:43 +01:00
Mitchell Hashimoto 8abada25b9 Fix poor variable reference in puppet server. Also colorize output 2012-01-17 21:16:52 -08:00
Mitchell Hashimoto d675b7c83c Replace `test?` call with proper `test` call 2012-01-17 14:43:32 -08:00
Mitchell Hashimoto 06733a070d NFS action no longer needs to recover from anything 2012-01-17 13:37:52 -08:00
Mitchell Hashimoto def09573c6 Up version for development 2012-01-17 13:37:36 -08:00
Mitchell Hashimoto 939a667979 v0.9.0 2012-01-17 11:32:18 -08:00
Mitchell Hashimoto 0cf619dec8 Update solaris networks API 2012-01-17 11:30:21 -08:00
Mitchell Hashimoto f4ea1f800c Update Arch guest to the new networks API 2012-01-17 11:25:40 -08:00
Mitchell Hashimoto 3a2546907e Update Gentoo guest to new networks API 2012-01-17 11:17:12 -08:00
Brad Greenlee 0181b167f6 Do expand_path in FileUtils.cp, where it really matters. 2012-01-14 15:19:29 -08:00
Mitchell Hashimoto f1d5fe27ab Check for /etc/exports before pruning 2012-01-13 20:38:20 -08:00
Mitchell Hashimoto 8f5232c5cf `vagrant package --base` 2012-01-13 17:55:01 -08:00
Mitchell Hashimoto 7f10c05b5b Clean up export progress output 2012-01-13 17:46:39 -08:00
Mitchell Hashimoto 29b5414295 Improve hostname setting for Debian to be more correct [GH-574] 2012-01-13 17:08:03 -08:00
Mitchell Hashimoto 0ee501fb6b More effective guest addition version check [GH-639] 2012-01-13 16:13:41 -08:00
Mitchell Hashimoto 1927f8ef79 No more `NFSHelpers` 2012-01-12 23:34:06 -08:00
Mitchell Hashimoto 3456bfd2fe Warn user we're pruning exports 2012-01-12 23:33:17 -08:00
Mitchell Hashimoto 7fdbb68917 Prune NFS exports more cleanly. 2012-01-12 23:30:19 -08:00
Mitchell Hashimoto 829f64406e Add `attempts` to chef provisioners. [GH-282] 2012-01-12 23:10:30 -08:00
Mitchell Hashimoto 22ff1bb047 Ubuntu will emit a `vagrant-mounted` event. [GH-576]
There will be a MOUNTPOINT variable available with this event that
will point to the shared folder that has been mounted.
2012-01-12 22:57:32 -08:00
Mitchell Hashimoto cfd0e0c30f Merge pull request #637 from zev/master
Fix chef_client variable name error for vm
2012-01-12 22:40:26 -08:00
Zev Blut 481a588bc8 Fix vm variable name to be env[:vm] 2012-01-13 15:38:35 +09:00
Mitchell Hashimoto 5630dc144d Fix up NFS to use the new VirtualBox drivers 2012-01-12 22:19:23 -08:00
Mitchell Hashimoto 5c2bb9412d A much cleaner way to find NFS folders to mount 2012-01-12 22:11:59 -08:00
Mitchell Hashimoto de450f7e63 Always clean the NFS exports 2012-01-12 22:11:59 -08:00
Mitchell Hashimoto 7dc5f8ca80 Revert "Always clear NFS exports for the VM booting [GH-529]"
This reverts commit 70705d2861.
2012-01-12 22:11:59 -08:00
Zev Blut ed894ab3a3 Fix syntax error for exception message. 2012-01-13 12:56:17 +09:00
Mitchell Hashimoto 70705d2861 Always clear NFS exports for the VM booting [GH-529] 2012-01-12 18:15:53 -08:00
Mitchell Hashimoto 6d212efdbd Fix ppk path by just... not using ppk anymore. [GH-634] 2012-01-12 18:03:35 -08:00
Mitchell Hashimoto 3834930189 Remove open-uri in http downloader [GH-635] 2012-01-12 17:53:56 -08:00
Mitchell Hashimoto 8cc162f48f Options after `--` to `vagrant ssh` are passed through to ssh [GH-554] 2012-01-11 23:49:42 -08:00
Mitchell Hashimoto 1f02318a5e Variable name conflict 2012-01-11 23:23:05 -08:00
Mitchell Hashimoto a8fe342520 Arbitrary mount options can be passed to shared folders with `:extra` [GH-551] 2012-01-11 23:20:12 -08:00
Mitchell Hashimoto 14d61f61ba The full options data is sent to mount_shared_folder 2012-01-11 23:14:04 -08:00
Mitchell Hashimoto f0b77d2f30 Additional fixes + tests for shell expansion [GH-633] 2012-01-11 22:56:15 -08:00
Brad Greenlee 9a242ba718 Do shell expansion before doing the file test in Vagrant::Downloaders::File#prepare so that "~/file/paths" work. 2012-01-11 22:54:11 -08:00
Mitchell Hashimoto 06d4b6a4e5 Don't default config values to nil 2012-01-11 22:35:28 -08:00
Mitchell Hashimoto 5c70dd1658 Remove nil defaults 2012-01-11 22:34:36 -08:00
Mitchell Hashimoto 863ebe2d2f Custom merging for VM config 2012-01-11 22:12:49 -08:00
Mitchell Hashimoto b7279ec79d Custom merging behavior for VM configuration 2012-01-11 21:35:09 -08:00
Mitchell Hashimoto 1e856f7c75 Remove unused configuration key 2012-01-11 21:30:59 -08:00
Mitchell Hashimoto bfb52ba7dc Top merges things in each key one by one by calling `merge` 2012-01-11 21:22:55 -08:00
Mitchell Hashimoto d13dd482b5 Some Config::Top class tests 2012-01-11 21:09:52 -08:00
Mitchell Hashimoto 008132b3cb Run each config proc only once 2012-01-11 20:59:21 -08:00
Mitchell Hashimoto 7c9c6e34ce Change caching behavior of config procs for the config loader 2012-01-11 16:58:40 -08:00
Mitchell Hashimoto 43a9f0928a Update CHANGELOG 2012-01-11 10:01:11 -08:00
Mitchell Hashimoto fc7111734b Clean up the Puppet provisioner a bit 2012-01-11 09:56:33 -08:00
Mitchell Hashimoto 73bff1b457 Fix up puppet provisioner a bit 2012-01-11 09:48:18 -08:00
Mitchell Hashimoto eaf6ce7372 Verify shared folders for puppet 2012-01-11 09:29:30 -08:00
Mitchell Hashimoto cb6020869f Prompt for `reload` if shared folders aren't setup for Chef [GH-253] 2012-01-10 22:36:39 -08:00
Mitchell Hashimoto bb2a473549 Added a `--provision-with` flag to specify provisioners to use. [GH-367] 2012-01-10 22:03:22 -08:00
Mitchell Hashimoto 18cdcb4330 Acceptance tests for chef solo, fixed a bug it found. 2012-01-10 21:08:43 -08:00
Mitchell Hashimoto 0c0d456db2 Add `--force` flag to `box add` [GH-631] 2012-01-10 20:37:33 -08:00
Mitchell Hashimoto fe012e800f Printing help due to invalid options should have error exit status 2012-01-10 20:30:18 -08:00
Mitchell Hashimoto 1aa73f7b70 Fix issue where "-c" was error checking... 2012-01-08 23:40:05 -08:00
Mitchell Hashimoto ef37f692bd Revert the check for duplicate Vagrantfiles.
This is just tricky with case sensitive/insensitive file systems.
Reverting since it doesn't seem worth it.
2012-01-08 23:15:18 -08:00
Mitchell Hashimoto 4f30a834d0 Tests for multivagrantfile being found 2012-01-08 23:04:23 -08:00
Mitchell Hashimoto 8aa4e58ea8 Check for conflicting DHCP servers 2012-01-08 20:33:12 -08:00
Mitchell Hashimoto 4e426249ed Basic :dhcp configuration works. 2012-01-08 20:33:12 -08:00
Mitchell Hashimoto 8c00d1d652 Raise an error if multiple matching Vagrantfiles are found [GH-588] 2012-01-08 11:54:32 -08:00
Mitchell Hashimoto 89eb256f9d Proper error handling if the shared folder cannot be created [GH-604] 2012-01-08 11:29:52 -08:00
Mitchell Hashimoto 9cb4597a27 :create flag on shared folders will create on host if it doesnt exist [GH-604] 2012-01-08 11:23:43 -08:00
Mitchell Hashimoto ba5cd9b88a Windows host 2012-01-08 11:14:01 -08:00
Mitchell Hashimoto 8d32002c02 Don't clear NFS exports on expected failure [GH-577] 2012-01-07 22:01:44 -08:00
Mitchell Hashimoto 27372ef313 Namespace ssh-config template 2012-01-07 21:56:14 -08:00
Mitchell Hashimoto acbc0d4b28 Namespace provisioner templates 2012-01-07 21:55:08 -08:00
Mike Fiedler fbf5237de2 missing require tempfile, and fixed a typo 2012-01-07 21:18:55 -08:00
Mitchell Hashimoto d07f0f8dd2 Support VirtualBox 4.0 2012-01-07 21:16:40 -08:00
Mitchell Hashimoto a94cf520c6 Log4r levels need to be defined before we can check for them 2012-01-07 21:16:40 -08:00
Mitchell Hashimoto 7954d4cba8 Driver forwarding to 4.1 works properly 2012-01-07 21:16:40 -08:00
Mitchell Hashimoto 5157cccaef Delegate all API methods to the proper version driver 2012-01-07 21:16:40 -08:00
Mitchell Hashimoto 767ee2509e VirtualBox base class for the driver. 2012-01-07 21:16:40 -08:00
Mitchell Hashimoto cab625c06c We should verify VirtualBox is detected before looking for the old VM 2012-01-07 21:16:28 -08:00
Mike Fiedler e05bfb7efc missing bracket closure fails rake tests 2012-01-07 21:16:28 -08:00
Mitchell Hashimoto 87b1a6660d Handle invalid log levels more gracefully 2012-01-07 21:16:22 -08:00
Mitchell Hashimoto a7bde74cf3 VirtualBox driver can handle Windows-style newlines 2012-01-07 21:16:09 -08:00
Mitchell Hashimoto 4b52c39733 More robust VBOX_INSTALL_PATH handling on Windows 2012-01-07 21:15:57 -08:00
Mitchell Hashimoto 75539c2abe Default host class is the base class 2012-01-07 13:13:17 -08:00
Mitchell Hashimoto d9f5cbce3e Initialize the connection ivar for SSH 2012-01-07 11:57:46 -08:00
Mitchell Hashimoto 7fce25e858 Show `attempting graceful shutdown` message from action, not guest 2012-01-07 11:44:53 -08:00
Mitchell Hashimoto 0f580fd2c0 Re-use SSH connection 2012-01-07 11:38:27 -08:00
Mitchell Hashimoto 7d56dbb755 Uploaded files now use temporary files rather than StringIO 2012-01-06 21:42:25 -08:00
Mitchell Hashimoto 275ddae646 Convert everything to the new SSH API 2012-01-06 20:07:32 -08:00
Mitchell Hashimoto 7bdbec4229 Start switching the old SSH API to the new one 2012-01-06 20:07:32 -08:00
Mitchell Hashimoto d094432238 No longer require `forwarded_port_key` setting, its gone 2012-01-06 20:07:32 -08:00
Mitchell Hashimoto faaa763d50 SSH connect is now SSH `exec` 2012-01-06 20:07:32 -08:00
Mitchell Hashimoto 19c1340e40 Vagrant::SSH no longer handles actual communication with the VM 2012-01-06 20:07:32 -08:00
Mitchell Hashimoto 8577935121 Syntaxerror 2012-01-06 20:07:31 -08:00
Mitchell Hashimoto 3ffa533011 ssh-config now uses the new ssh_info method 2012-01-06 20:07:31 -08:00
Mitchell Hashimoto 7ed9f8bd73 SSH communication should inherit from Base 2012-01-06 20:07:31 -08:00
Mitchell Hashimoto 47a368fbfd VM raises SSHPortNotDetected if ssh_info can't get the port
Also, I updated the wording on that error message a bit since it
turns out that it is possible through user error that there will
be no SSH port.
2012-01-06 20:07:31 -08:00
Mitchell Hashimoto acaabd5aa3 Remove forwarded_port_key/destination from config, replace with guest_port 2012-01-06 20:07:31 -08:00
Mitchell Hashimoto 00a31ff27b Communication abstraction. Started SSH. 2012-01-06 20:07:31 -08:00
Mitchell Hashimoto 396beb9faf Require tempfile in shell provisioner 2012-01-06 17:36:51 -08:00
Mitchell Hashimoto 67aa4c3819 Get rid of unavailable API 2012-01-05 23:12:28 -08:00
Mitchell Hashimoto 586f506eff Fix a terrible typo that causes vagrant ssh to fail 2012-01-05 23:08:20 -08:00
Mitchell Hashimoto d0c85afd47 IdentityFile works again in ssh-config [GH-626] 2012-01-05 23:01:35 -08:00
Mitchell Hashimoto 79e8a6ef0a Port forwarding definitions with the same guest port will override earlier 2012-01-05 22:58:38 -08:00
Mitchell Hashimoto e85095d1bf Subprocess uses readpartial on IO for Windows [GH-610]
Windows doesn't support read_nonblock.
2012-01-05 23:48:30 -08:00
Mitchell Hashimoto 467542ef8d Use VBOX_INSTALL_PATH on Windows to find VBoxManage [GH-609] 2012-01-05 23:12:17 -08:00
Mitchell Hashimoto 323663c4fb Handle MacPorts strange VirtualBox version formatting [GH-619] 2012-01-04 21:46:46 -08:00
Mitchell Hashimoto fc3bb6ca92 Code style for RedHat network configurations 2012-01-04 21:43:14 -08:00
Mike Fiedler a04fce880c Changes to enable rhel/centos-style bridged & hostonly networking 2012-01-04 21:39:36 -08:00
Mitchell Hashimoto 026a551496 `vagrant ssh -p` is now plain mode 2012-01-04 21:28:30 -08:00
Mitchell Hashimoto a6c3551064 Merge pull request #621 from bitprophet/clean-ssh-option
Allow 'vagrant ssh' to strip most non-port options.
2012-01-04 21:20:12 -08:00
Mitchell Hashimoto ef1037ff7c Cleanup puppet provisioner even more 2012-01-04 19:26:25 -08:00
Mitchell Hashimoto 36a59a89fc Merge pull request #620 from LeftyBC/master
Fixup for variable scoping in the puppet provisioner
2012-01-04 19:10:35 -08:00
Elliot Pahl 9c89ed9c06 Fix vm state check in ssh-config. 2012-01-04 19:08:19 -08:00
Colin Moller 0466d76bd8 Merge remote branch 'mitchellh/master' 2012-01-04 16:50:22 -08:00
Mitchell Hashimoto 09e11ae792 Fix forwarded port map which still references "name" 2012-01-04 16:47:03 -08:00
Colin Moller b572b7dbd6 Merge remote branch 'mitchellh/master' 2012-01-04 16:21:12 -08:00
Mitchell Hashimoto 175d95fcf1 Fix regex syntax for 1.8 2012-01-04 16:18:11 -08:00
Jeff Forcier e646df5655 Tweak a variable name & help string 2012-01-04 12:47:53 -08:00
Jeff Forcier 72b609f0a6 Allow 'vagrant ssh' to strip most non-port options.
Adds a -p flag to 'vagrant ssh' which strips out username, private key
args, allowing the local user's ssh settings to take full effect.
2012-01-04 12:37:23 -08:00
Colin Moller 0f5f607767 Fix scoping for env and config.vm variables in the puppet provisioner. 2012-01-04 12:28:18 -08:00
Mitchell Hashimoto a1b66f82aa Consistently generate names for forwarded ports.
To do this, I convert the ports to base 32 strings in the format
of "guestport-hostport." This makes a consistent mapping we can use
to look up if the forwarded port is set.
2012-01-03 10:34:35 -08:00
Mitchell Hashimoto b45286f780 Don't bother enabling/configuring network adapters if there are none 2012-01-03 10:24:31 -08:00
Mitchell Hashimoto 2d1ed88bcd Forwarded ports no longer require a name paramter 2012-01-03 10:22:42 -08:00
Mitchell Hashimoto aac9bb5ec5 Make adapter 1-based for forwarded ports as well 2012-01-03 10:11:07 -08:00
Mitchell Hashimoto 7982f01f2e Check for adapter collisions 2012-01-03 09:34:32 -08:00
Mitchell Hashimoto 20edb5d05a Error if no available network adapters are found 2012-01-03 08:01:26 -08:00
Mitchell Hashimoto 09945fe4f9 Better documentation and error messages for unsupported guest features 2012-01-03 07:50:01 -08:00
Mitchell Hashimoto 99d3565132 Delete old networking actions 2012-01-02 19:53:29 -08:00
Mitchell Hashimoto 97f7fa633d Re-implement how networking is done internally 2012-01-02 19:51:38 -08:00
Mitchell Hashimoto 76a77432b8 Clear all network adapters during the boot process 2012-01-01 22:02:30 -08:00
Mitchell Hashimoto 22d042cb94 Vagrant now asks what adapter to bridge to 2012-01-01 00:05:47 -08:00
Mitchell Hashimoto 567c09df21 Allow a MAC address to be specified for bridges 2011-12-31 19:13:51 -08:00
Mitchell Hashimoto c48a31d6bd Fix template paths for other guests 2011-12-31 19:08:56 -08:00
Mitchell Hashimoto 474ac3a63d Enabling bridged networks on Debian 2011-12-31 11:53:04 -08:00
Mitchell Hashimoto 42883cbd20 Bridged networking basics. 2011-12-31 11:35:09 -08:00
Mitchell Hashimoto 8f3a7ce22d Rename Network action to HostOnlyNetwork 2011-12-31 01:04:06 -08:00
Mitchell Hashimoto f7125b1dd7 Default host only adapters to #1 again 2011-12-31 00:55:37 -08:00
Mitchell Hashimoto 77b915f06a Logging, and prepare code to automatically find next available adapter 2011-12-31 00:34:08 -08:00
Mitchell Hashimoto b36e3c447e Add a deprecation error for the old style of configuring host only networks 2011-12-30 23:39:16 -08:00
Mitchell Hashimoto b5b3805157 Add validation once again for host only networks 2011-12-31 10:55:37 +09:00
Mitchell Hashimoto c64f5e8d05 Refactor the Network action a bit 2011-12-31 05:03:17 +09:00
Mitchell Hashimoto 3f0bd6def4 Fix regex warning for Ruby 1.8.7 2011-12-31 04:22:44 +09:00
Mitchell Hashimoto b66755cf26 Proper number of arguments for Puppet provisioner 2011-12-31 04:21:17 +09:00
Mitchell Hashimoto 0d2cf4bbe7 Upgrade to ChildProcess 0.2.4 for LaunchError 2011-12-26 19:55:10 -08:00
Mitchell Hashimoto 7e4d652702 Make export in general VBoxManage friendly 2011-12-26 19:06:44 -08:00
Mitchell Hashimoto fbe984b32d Check for package files before any exports or anything [GH-597] 2011-12-26 18:48:38 -08:00
Mitchell Hashimoto 6a1864011d Require things as they're needed 2011-12-26 18:36:18 -08:00
Mitchell Hashimoto ab0276c4a9 VM::Modify no longer exists 2011-12-26 18:35:19 -08:00
Mitchell Hashimoto e0998b0b0f Use proper UI with VM 2011-12-26 18:14:09 -08:00
Mitchell Hashimoto 4428daf344 A regex string can be passed to commands in Multi-VM 2011-12-26 18:12:02 -08:00
Mitchell Hashimoto 8f522225a1 Fix issue that could cause config loader to fail if no block given to a subvm 2011-12-26 18:07:39 -08:00
Mitchell Hashimoto ad7f4c79ad Make requiring a single VM target in a command more DRY 2011-12-26 17:59:18 -08:00