Commit Graph

1969 Commits

Author SHA1 Message Date
Mitchell Hashimoto ab8b1d3ea6 Fix some issues with puppet server config inheritance 2012-02-04 13:51:36 +01:00
withnail e90c36ac77 puppet_server certname changes
At present, puppet_node is defined by default and must almost always be
overwritten. This changes the logic for puppet_server so puppet_node is
initially undefined and the node name will be set based on this order

1. puppet_node if defined
2. host_name if defined (actually this removes the explicit certname
specification which is cleaner and uses the machine hostname)
3. config.vm.box
2012-02-04 13:50:15 +01:00
withnail 77c1b7c9e2 Only list bridged interfaces that are up [GH-701] 2012-02-01 15:38:57 -08:00
semarj 535bda2a4e properly restart the interface. Was failing with /sbin/ifup 2012-01-31 22:36:38 -06:00
Scott Sanders 2d327055f3 Do not allow BSD hosts to double-quote in exports
This is not allowed on *BSD
2012-01-30 19:52:59 -08:00
Scott Sanders 0ec02fe711 Update comment to better reflect the actual issue 2012-01-30 19:52:36 -08:00
Scott Sanders 28c377848f Update FreeBSD guest to support networking
The latest update to 0.9.x broke FreeBSD networking. This patch fixes
things by moving the code into the right method.
2012-01-30 19:51:58 -08:00
Mitchell Hashimoto f9a42973d9 Select NFS version with :nfs_version 2012-01-29 13:34:50 -08:00
Mitchell Hashimoto 3a8c44301b Fix some issues with NFS version selecting 2012-01-29 13:33:35 -08:00
Russ Garrett ced99edd59 Allow user to choose NFS protocol version, defaulting to 3
NFSv4 has siginificant added complexity in the form of ID-mapping which
can cause problems with applications without extra setup. Best to
force version 3 unless the user requests it.

Conflicts:

	lib/vagrant/systems/linux.rb
2012-01-29 13:27:42 -08:00
Mitchell Hashimoto f095939800 Update changelog for GH-690 2012-01-28 21:50:57 -08:00
sathlan 4715400761 The type of nic can be set for bridged network.
:nic_type can be specified in the network bridged type. Its value can
be Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, virtio.
2012-01-28 21:50:04 -08:00
Mitchell Hashimoto d687473760 Fix crashing issue when all networks don't aut config [GH-689] 2012-01-28 21:48:12 -08:00
Mitchell Hashimoto f8619007a7 Update version for dev 2012-01-28 17:39:47 -08:00
Mitchell Hashimoto 261dadb1c6 v0.9.4 2012-01-28 17:38:53 -08:00
Mitchell Hashimoto 912e4974db Registry will now cache result values.
This is actually required so that we can do things like this
in plugins:

Vagrant.actions[:up].insert(Foo, Bar)
2012-01-28 17:31:50 -08:00
Mitchell Hashimoto 88ba3a3619 Change middleware internals to make plugin lives easier [GH-684] 2012-01-28 17:31:50 -08:00
Mitchell Hashimoto e9ae63f3b5 Merge pull request #688 from schisamo/transient-shared-folder-support
add vbox driver support for creating transient shared folders
2012-01-28 16:50:27 -08:00
Mitchell Hashimoto 6d7a3d9b64 More accurate VBoxManage error detection. 2012-01-27 12:40:42 -08:00
Seth Chisamore 14c4dc5d53 add vbox driver support for creating transient shared folders 2012-01-27 11:53:42 -08:00
Mitchell Hashimoto e1dbc7f9b1 Fix some puppet translation 2012-01-27 10:52:27 -08:00
Mitchell Hashimoto 5500058343 Call xpg4/bin/id on Solaris [GH-679] 2012-01-26 09:56:06 -08:00
Mitchell Hashimoto 20fa355502 Uncolorize puppet server output since it does it for us [GH-685] 2012-01-26 09:52:37 -08:00
Mitchell Hashimoto 8d6a33584f Set the name as a separate step. [GH-669] 2012-01-25 21:16:21 -08:00
Mitchell Hashimoto 195a0d6999 Logging for host detection 2012-01-25 10:42:35 -08:00
Mitchell Hashimoto f1dd5459f2 Properly detect Arch, Fedora, FreeBSD [GH-683] 2012-01-25 10:39:17 -08:00
Mitchell Hashimoto 0576d6e817 NFS shared folders can have the :create flag, too [GH-667] 2012-01-24 21:54:47 -08:00
Mitchell Hashimoto e6ea1c6340 NFS shared folders can contain unexpanded guest paths 2012-01-24 21:40:35 -08:00
Mitchell Hashimoto 3cda2e48dc Setting :auto_config to false will not configure a network. [GH-663] 2012-01-24 21:29:26 -08:00
Mitchell Hashimoto ce2ea4ea93 Error message when kernel module is not loaded for VirtualBox [GH-677] 2012-01-24 19:30:55 -08:00
Mitchell Hashimoto f48a2784a0 Regexp escape VM names when matching for them. 2012-01-24 17:03:55 -08:00
Mitchell Hashimoto 0dbd012d6b Up version for dev 2012-01-24 00:19:04 -08:00
Mitchell Hashimoto aeaf44db32 v0.9.3 2012-01-24 00:18:10 -08:00
Mitchell Hashimoto 3a5f0cefb3 Remove ANSI escape codes from SSH output
Note that the ANSI escape code removal is not complete,
but is fairly comprehensive in terms of the codes that
really muck with the terminal layout.
2012-01-23 19:29:07 -08:00
Mitchell Hashimoto d1e78f791d Remove test warnings, add ANSI escape code remover 2012-01-23 19:24:32 -08:00
Ryan Gibbons 2339f3c833 use printf instead of echo
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html#tag_20_37_16
2012-01-23 18:11:17 -08:00
Mitchell Hashimoto 17224e3df6 Merge pull request #675 from scoates/755499
ignore host-only interface if it is down
2012-01-23 17:57:17 -08:00
Mitchell Hashimoto ae8b476639 Fix crashing issue with bridged networking [GH-673] 2012-01-23 10:05:03 -08:00
Sean Coates 755499dcf9 ignore interface if it is Ddown (not 100% sure about vbox4.0 support; please test) 2012-01-23 10:38:18 -05:00
Mitchell Hashimoto f2eff93c38 Proper error handling of missing arguments to all box commands 2012-01-20 15:23:33 -08:00
Mitchell Hashimoto 9fce04c2cd Test for the correct number of arguments to box add 2012-01-20 15:21:54 -08:00
Mitchell Hashimoto 4252fe94de Up version for dev 2012-01-20 11:41:12 -08:00
Mitchell Hashimoto 3b4cf0b225 v0.9.2 2012-01-20 11:40:17 -08:00
Mitchell Hashimoto ce365336cd Unnecessary line of code 2012-01-20 11:36:12 -08:00
Mitchell Hashimoto 97235ee080 Clean up some impl [GH-666] 2012-01-20 11:25:39 -08:00
Jarmo Pertman b9046a5594 enable colors on Windows when using ANSICON 2012-01-20 11:21:16 -08:00
Mitchell Hashimoto 4ead6e3f82 If there is only one bridgable interface, just use that [GH-655] 2012-01-19 21:11:42 -08:00
Mitchell Hashimoto f022e9ee36 Fix issue where chef solo always expected "cookbooks" folder [GH-638] 2012-01-19 21:06:09 -08:00
Mitchell Hashimoto d487e286f4 Don't merge config keys that start with __.
This allows config classes to store internal state somehow.
2012-01-19 20:54:09 -08:00
Mitchell Hashimoto f87c25bac8 Provide defaults in a proper way for Chef config 2012-01-19 20:47:01 -08:00
Mitchell Hashimoto 28eddafa56 Better logging in linux guest impl 2012-01-19 20:17:10 -08:00
Mitchell Hashimoto be97cec8b5 Allow shell expansions in shared folder guest paths again [GH-656] 2012-01-19 20:14:05 -08:00
Mitchell Hashimoto ac48d270eb Error if :vagrant is used as chef JSON key. [GH-661] 2012-01-19 19:48:57 -08:00
Mitchell Hashimoto 89fb684297 Add a deprecation error for `config.vm.system=` [GH-653] 2012-01-19 17:41:34 -08:00
Mitchell Hashimoto 9b4925d5de Use ifdown instead of ifconfig down for Ubuntu/Debian 2012-01-19 17:36:29 -08:00
Mitchell Hashimoto 0d455fcf73 Get rid of nil dereference error when reading version [GH-658] 2012-01-19 17:34:06 -08:00
Mitchell Hashimoto 3f3476f323 Use symbol as a hash key for subprocess. Guarantees we always get a string back. 2012-01-19 17:24:22 -08:00
Mitchell Hashimoto 527b79853c Log output now goes on stderr by stdout 2012-01-19 17:12:18 -08:00
Mitchell Hashimoto e68eb1f4f3 More verbose logging for SSH 2012-01-19 17:02:18 -08:00
Mitchell Hashimoto 87b03609db Filter clear screen character out of stderr as well 2012-01-19 15:14:11 -08:00
Ryan Gibbons 8aa1d58b33 filter the clear screen command over ssh connections 2012-01-19 16:03:59 -07:00
Mitchell Hashimoto 3db8db9cdc Fix reference to a class that doesn't exist 2012-01-19 14:21:26 -08:00
Mitchell Hashimoto c600d9237b Properly merge forward_agent and other SSH configs [GH-651] 2012-01-18 18:48:07 -08:00
Mitchell Hashimoto ce53263a11 Update version for development 2012-01-18 11:14:02 -08:00
Mitchell Hashimoto 231747cb7e v0.9.1 2012-01-18 11:12:53 -08:00
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
Mitchell Hashimoto 0887a18079 Make some fixes to get tests passing on Ruby 1.8.7 2011-12-26 17:45:55 -08:00
Mitchell Hashimoto fd331ee785 Util::Busy calls the callbacks in reverse order 2011-12-26 17:03:29 -08:00
Mitchell Hashimoto bfc85d7f14 Handle interrupts well with VirtualBox. 2011-12-26 17:00:41 -08:00
Mitchell Hashimoto f65a6c3c6f `vagrant ssh -c` stderr now goes to stderr on the host as well 2011-12-26 10:03:12 -08:00
Mitchell Hashimoto e07280593d `vagrant ssh -c` will now exit with the same exit status of the command [GH-598] 2011-12-26 09:58:10 -08:00
Mitchell Hashimoto 72b249fd19 Do port forwarding threshold check in the `call` method 2011-12-25 15:36:15 -08:00
Mitchell Hashimoto ca938f041c Check currently forwarded ports when looking for collisions [GH-606] 2011-12-25 13:13:01 -08:00
Mitchell Hashimoto 81ad053f8a Check for port collisions after clearing forwarded ports on `up` 2011-12-25 10:18:49 -08:00
Mitchell Hashimoto d80ff0a27f Pull out port collision detection/correction into the CheckPortCollision middleware 2011-12-25 10:13:08 -08:00
Mitchell Hashimoto e870d1b29e Discarding state works with VBoxManage 2011-12-25 09:53:54 -08:00
Mitchell Hashimoto 76f605f08d Nice error message if port collisions are detected on `resume` [GH-602] 2011-12-25 09:48:49 -08:00
Mitchell Hashimoto cc9abc8b9b Fix up some subprocess comments 2011-12-22 21:55:57 -08:00
Mitchell Hashimoto c0fabbe2bd Fix interrupted? call in boot 2011-12-22 21:50:20 -08:00
Mitchell Hashimoto 963bdff9fd Use Vagrant::Util::Subprocess for acceptance tests 2011-12-22 21:46:43 -08:00
Mitchell Hashimoto b72b70a845 DataStore: Remove the file_path check in commit 2011-12-22 21:20:31 -08:00
Mitchell Hashimoto 40fdab3de8 DataStore tests and slight modifications 2011-12-22 21:18:59 -08:00
Mitchell Hashimoto 40689b556b Logging in the DataStore class 2011-12-22 20:46:03 -08:00
Mitchell Hashimoto 3cd262ed75 Unit tests for Vagrant::Action::Builder 2011-12-22 20:17:45 -08:00
Mitchell Hashimoto 9f498ccb06 Subprocess now works properly with Ruby 1.8.7 2011-12-22 16:22:41 -08:00
Mitchell Hashimoto 5e5e0f69dc `vagrant ssh` works again 2011-12-22 13:48:22 -08:00
Mitchell Hashimoto dfeafa3776 Fix halt issues and acceptance test associated with it 2011-12-22 13:38:30 -08:00
Mitchell Hashimoto 36632c4bb7 Handle the case properly where the VM in `.vagrant` doesn't exist anymore 2011-12-22 13:03:08 -08:00
Mitchell Hashimoto 3eede78876 Get rid of 64-bit Windows error since it should work now 2011-12-22 12:51:20 -08:00
Mitchell Hashimoto e31ef01679 NAT checking for forwarded ports 2011-12-22 11:47:52 -08:00
Mitchell Hashimoto 1e21fdd67a Do a block_given check on import so you can call it w/o a block 2011-12-22 11:31:47 -08:00
Mitchell Hashimoto 698ad0af7e Import progress works again 2011-12-22 11:29:58 -08:00
Mitchell Hashimoto 4093e79027 Removed deprecation notice for chef_server to chef_client 2011-12-21 23:27:43 -08:00
Mitchell Hashimoto ecbf7df859 Host only networks now work with VBoxManage 2011-12-21 22:27:06 -08:00
Mitchell Hashimoto 79460f6122 Subprocess: Check if data is empty after the process exits as well 2011-12-21 22:12:22 -08:00
Mitchell Hashimoto 271c3827a1 Subprocess: catch any stdout/stderr left over after process exits 2011-12-21 21:58:23 -08:00
Mitchell Hashimoto 63720cc750 Fix reload with VBoxManage 2011-12-21 16:48:19 -08:00
Mitchell Hashimoto a3395f94ab Catch and handle customization errors 2011-12-21 16:37:59 -08:00
Mitchell Hashimoto e1d0ce19ce Customizations are back in! 2011-12-21 16:25:58 -08:00
Mitchell Hashimoto 306945dd26 Nice error messages if VBoxManage command fails 2011-12-21 15:41:14 -08:00
Mitchell Hashimoto 0aae0dd588 Box verification works with VBoxManage 2011-12-21 15:34:51 -08:00
Mitchell Hashimoto d030c62820 Remove unused classes from autoload 2011-12-21 15:25:20 -08:00
Mitchell Hashimoto 177eb828af Remove customize action, this will need rethinking 2011-12-21 15:24:43 -08:00
Mitchell Hashimoto 7a70755362 Destroying unused network interfaces via VBoxManage 2011-12-21 15:17:10 -08:00
Mitchell Hashimoto d2e33768f3 CleanMachineFolder action works with VBoxManage 2011-12-21 14:45:14 -08:00
Mitchell Hashimoto 4c7059eaf6 Remove virtualbox dep 2011-12-21 14:36:51 -08:00
Mitchell Hashimoto 8eb1770b9d Fix issue where we may not get the full output in a subprocess 2011-12-21 14:28:43 -08:00
Mitchell Hashimoto d5981978a1 Resuming works better 2011-12-21 14:15:03 -08:00
Mitchell Hashimoto a6e5078e4b VM suspending works 2011-12-21 14:12:35 -08:00
Mitchell Hashimoto 8360bcf61b Fix guest loading w/ VBoxManage 2011-12-21 13:54:51 -08:00
Mitchell Hashimoto 9cb0578c64 VM halt works. 2011-12-21 13:41:10 -08:00
Mitchell Hashimoto 48ea8173c6 Lots more VBoxManage 2011-12-21 13:37:59 -08:00
Mitchell Hashimoto 7527f6b7b6 Check for guest additions right after import 2011-12-21 12:11:48 -08:00
Mitchell Hashimoto a39df9f150 Forwarded ports 2011-12-20 22:28:47 -08:00
Mitchell Hashimoto c59defa7e8 Drivers now take a UUID 2011-12-20 21:20:45 -08:00
Mitchell Hashimoto a8e4e62264 Make more things VBoxManage compatible 2011-12-20 21:20:45 -08:00
Mitchell Hashimoto 96868e5d29 Import and destroy work with the new driver interface 2011-12-20 21:20:45 -08:00
Mitchell Hashimoto 2de7a1424d Load VirtualBox VM in the VM class 2011-12-20 21:20:45 -08:00
Mitchell Hashimoto 9debf5abe9 Attach a driver to each VM. Use that to detect VirtualBox. 2011-12-20 21:20:45 -08:00
Mitchell Hashimoto ee389c33f7 `vagrant --help` now works for Ruby 1.8.7 [GH-599] 2011-12-20 16:28:45 -08:00
Mitchell Hashimoto 6a191f968c Fix autoload typo for redhat guest [GH-600] 2011-12-20 16:27:51 -08:00
Mitchell Hashimoto f9b3e89373 Enable provisioning by default [GH-601] 2011-12-20 16:27:08 -08:00
Mitchell Hashimoto a8f5ed1863 Require vagrant environments for some commands. 2011-12-18 13:26:15 -08:00
Mitchell Hashimoto 98df762f8c `vagrant init` uses new OptParse based CLI 2011-12-17 21:06:00 -08:00
Mitchell Hashimoto 1770ad1ee5 "provision.enabled" is once again honored. [GH-591] 2011-12-17 20:28:45 -08:00
Mitchell Hashimoto c2e3a3050a Ruby 1.8.7 compatibility 2011-12-17 20:22:46 -08:00
Mitchell Hashimoto 9bdff4c507 Styling 2011-12-17 19:53:57 -08:00
Mitchell Hashimoto e29c5436e1 Box commands 2011-12-17 19:52:48 -08:00
Mitchell Hashimoto 780722386b `vagrant status` 2011-12-17 17:36:11 -08:00
Mitchell Hashimoto 1176c65138 `vagrant ssh-config` 2011-12-17 17:29:52 -08:00
Mitchell Hashimoto e34f0a8af7 `vagrant ssh` 2011-12-17 17:24:02 -08:00
Mitchell Hashimoto 19adc3189d `vagrant package` 2011-12-17 16:58:54 -08:00
Mitchell Hashimoto bdc39aa2e0 Suspend command 2011-12-17 12:04:35 -08:00
Mitchell Hashimoto 91d19b91e4 Improved help output for `vagrant` cli 2011-12-17 12:02:19 -08:00
Mitchell Hashimoto a327eadd5f Fix a nomethoderror on a nil 2011-12-17 11:54:21 -08:00
Mitchell Hashimoto c5ec4b4a30 Provision, reload, resume 2011-12-17 11:53:26 -08:00
Mitchell Hashimoto 6c7e88c3ec `vagrant halt` 2011-12-17 11:14:56 -08:00
Mitchell Hashimoto 7a76fd7e05 Remove the 0.6.0 upgrade command. We're far passed that :) 2011-12-17 11:11:02 -08:00
Mitchell Hashimoto 45d07a8382 Remove old Thor base classes 2011-12-17 11:10:42 -08:00
Mitchell Hashimoto e71007d47e `vagrant destroy` 2011-12-17 11:05:49 -08:00
Mitchell Hashimoto b292008f3b Change parse_options a bit to automatically add help and detect invalid options 2011-12-17 09:25:46 -08:00
Mitchell Hashimoto 43cadfe830 `vagrant up` 2011-12-17 09:14:05 -08:00
Mitchell Hashimoto 7191a54ed7 Print help and exit on "-h" 2011-12-17 08:18:43 -08:00
Mitchell Hashimoto a4a77dc420 Remove the old version command. 2011-12-16 23:39:49 -08:00
Mitchell Hashimoto 27491b554c Remove thor from requirements. Start revamping Vagrant::CLI 2011-12-16 23:34:30 -08:00
Mitchell Hashimoto 5f567f30d8 Provisioner output is now colorized based on stdout/stderr [GH-595] 2011-12-16 17:55:12 -08:00
Mitchell Hashimoto f37778c848 Don't output json_class with the config json 2011-12-16 17:38:19 -08:00
Mitchell Hashimoto 7157bd9cdb Re-namespace messages for systems to the vagrant.guest 2011-12-15 21:07:43 -08:00
Mitchell Hashimoto 1fcca71ce9 Re-namespace all systems to the Vagrant::Guest module 2011-12-15 21:05:19 -08:00
Mitchell Hashimoto 5fe50c8b5d Change config.vm.system to config.vm.guest. Rename internals. 2011-12-15 20:55:16 -08:00
Mitchell Hashimoto eda286b476 Config classes are registered via a registry now 2011-12-15 20:32:33 -08:00
Mitchell Hashimoto 7ab6ab31f8 Another tweak to chef to get it to work with new system 2011-12-14 23:37:47 -08:00
Mitchell Hashimoto 345ee35e16 When import recovers, don't validate when calling destroy 2011-12-14 23:35:46 -08:00
Mitchell Hashimoto a23ebf7220 Fix chef configuration 2011-12-14 23:31:21 -08:00
Mitchell Hashimoto e602af8c3a Convert chef provisioners to new format 2011-12-14 23:19:46 -08:00
Mitchell Hashimoto e5303a82e0 Autoload provisioners. 2011-12-14 22:49:14 -08:00
Mitchell Hashimoto b428072bb5 Provisioners use the registry. Cleaned up the way config classes are searched for. 2011-12-14 22:43:45 -08:00
Mitchell Hashimoto 9e4475cb77 Test running shell scripts inline 2011-12-14 19:02:10 -08:00
Mitchell Hashimoto 6dbade0fc6 Get shell provisioning working again, acceptance test to prove it 2011-12-13 23:45:56 -08:00
Mitchell Hashimoto ee33588d10 Clean up system loading quite a bit 2011-12-12 00:03:28 -08:00
Mitchell Hashimoto c66d846cb7 Fix issue which caused NFS to not work with new config 2011-12-11 23:30:17 -08:00
Mitchell Hashimoto fd9b752938 Make host class available to all actions 2011-12-11 23:27:53 -08:00
Mitchell Hashimoto daeb7ea726 Send new `id` element into NFS methods for hosts 2011-12-11 23:26:04 -08:00
Mitchell Hashimoto cdc01c449d Re-order things in vagrant.rb slightly 2011-12-11 23:24:23 -08:00
Mitchell Hashimoto 668bab0ba9 Better host loading scheme 2011-12-11 23:22:44 -08:00
Mitchell Hashimoto b8d40ea463 Registry is enumerable 2011-12-11 18:29:42 -08:00
Mitchell Hashimoto e201d9cacf Rename action registry to just Vagrant::Registry 2011-12-11 18:22:06 -08:00
Mitchell Hashimoto ad03163eff Tweak timeouts so SSh detection works 2011-12-11 16:41:51 -08:00
Mitchell Hashimoto 48f0a50e61 More logging in SSH class 2011-12-11 16:39:36 -08:00
Mitchell Hashimoto e5c2f38d7c Fix validate calls to provisioners 2011-12-11 16:33:50 -08:00
Mitchell Hashimoto 05ae297fd2 Copy insecure private key to user owned directory [GH-580] 2011-12-11 16:32:25 -08:00
Mitchell Hashimoto 98b8d858c4 Error message for improperly packaged boxes [GH-198] 2011-12-10 21:49:00 -08:00
Mitchell Hashimoto 7d8f6e511b Fix syntax error 2011-12-10 21:30:54 -08:00
Mitchell Hashimoto f44f1831ef Special error message if SCP is unavailable [GH-568] 2011-12-10 21:30:04 -08:00
Mitchell Hashimoto 98448d5557 Merge branch '089' 2011-12-10 21:11:36 -08:00
Mitchell Hashimoto b67dc75dfc v0.8.10 2011-12-10 21:08:13 -08:00
Mitchell Hashimoto 00c40f82b1 Return true on ssh up? 2011-12-10 21:07:45 -08:00
Mitchell Hashimoto c4eeda2025 v0.8.9 2011-12-10 20:43:20 -08:00
Mitchell Hashimoto b65cb54636 Remove the "echo hello" check because it does nothing. 2011-12-10 20:42:34 -08:00
Hedgehog a4423270f7 sleeping with the fiSSHes? 2011-12-10 20:33:12 -08:00
Mitchell Hashimoto 99b43fbeb8 Use shutdown instead of `halt` [GH-575] 2011-12-10 20:29:58 -08:00
Mitchell Hashimoto e9f8e4dc91 Revert 8bb6d375 since it actually didn't help at all. 2011-12-10 20:23:52 -08:00
Mitchell Hashimoto 5762775998 Reorganize little methods and remove unused methods 2011-12-10 20:22:44 -08:00
Mitchell Hashimoto 4006befe7f Trivial whitespace change 2011-12-10 20:20:01 -08:00
Mitchell Hashimoto 069a1c1348 Try to actually create directory before showing home directory error 2011-12-10 17:37:18 -08:00
Mitchell Hashimoto d9e2c8b788 Raise a nice error if home directory is not accessible 2011-12-10 17:14:07 -08:00
Mitchell Hashimoto d05c6f9d61 Get regression working again 2011-12-10 16:38:01 -08:00
Mitchell Hashimoto baba6af4ff Resource prefixes in UI output work 2011-12-10 16:17:09 -08:00
Mitchell Hashimoto 40b9254d5a Environment reloading works 2011-12-10 16:07:28 -08:00
Mitchell Hashimoto a1d3f8b4dd Fix typo to get networking working again 2011-12-10 14:27:59 -08:00
Mitchell Hashimoto 448e9429ac Get rid of broken env.ui calls in actions 2011-12-10 14:23:22 -08:00
Mitchell Hashimoto 697fb7eaaf Get rid of more env.env calls 2011-12-10 14:22:04 -08:00
Mitchell Hashimoto 9e58e45c69 Fix resume action to work properly 2011-12-10 14:18:40 -08:00
Mitchell Hashimoto 71c39126e5 Fix suspend action to work again 2011-12-10 14:15:18 -08:00
Mitchell Hashimoto 2a7f0d8a85 Return nil if no root path to determine dotfile 2011-12-10 13:56:34 -08:00
Mitchell Hashimoto 6093dcc26d Fix systems dependence on env 2011-12-10 13:44:45 -08:00
Mitchell Hashimoto ea7caebe02 Setup the default name for the VM 2011-12-10 13:28:03 -08:00
Mitchell Hashimoto f2666a9b74 Config validation is back in. 2011-12-10 13:21:45 -08:00
Mitchell Hashimoto 5c6ca57409 Throw an error if a box already exists when calling box.add 2011-12-10 13:09:03 -08:00
Mitchell Hashimoto 2f85fe1d4f Return proper dotfile path 2011-12-10 13:02:00 -08:00
Mitchell Hashimoto 93e5bc3969 Tweak actions for new runner 2011-12-10 12:52:42 -08:00