Commit Graph

1770 Commits

Author SHA1 Message Date
Mitchell Hashimoto 90d7742c9c More intelligent puppet server cert name handling 2012-02-04 13:57:02 +01:00
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