Commit Graph

3721 Commits

Author SHA1 Message Date
Mitchell Hashimoto 0e9711d0dd kernel: config.vm.host_name works again 2013-08-28 17:17:07 -07:00
Mitchell Hashimoto caf153270a Update CHANGELOG 2013-08-28 17:03:42 -07:00
Mitchell Hashimoto 826c8a884d Merge pull request #1801 from davegudge/patch-1
core: use getent to get group ID
2013-08-28 17:02:46 -07:00
Mitchell Hashimoto adb72b07d5 plugins/provisioners: put generated inventory file in vagrantfile dir 2013-08-28 16:54:44 -07:00
Mitchell Hashimoto 8445308830 Merge branch 'generate_ansible_hosts' of https://github.com/commandtab/vagrant into commandtab-generate_ansible_hosts
Conflicts:
	plugins/provisioners/ansible/provisioner.rb
2013-08-28 16:52:13 -07:00
Mitchell Hashimoto c4e018b9f6 Update CHANGELOG 2013-08-28 16:49:55 -07:00
Mitchell Hashimoto 8f2f654446 Merge branch 'chef_solo_environment_support' of https://github.com/marcparadise/vagrant into marcparadise-chef_solo_environment_support
Conflicts:
	plugins/provisioners/chef/config/chef_solo.rb
2013-08-28 16:49:19 -07:00
Mitchell Hashimoto 02399a145c provisioners/ansible: allow verbose :extra to be string 2013-08-28 16:46:04 -07:00
Mitchell Hashimoto 7f4367085b Update CHANGELOG 2013-08-28 16:45:39 -07:00
Mitchell Hashimoto 99a51a1ba8 Merge pull request #1979 from bmabey/patch-1
provisioners/ansible: adds extra verbosity option
2013-08-28 16:45:04 -07:00
Mitchell Hashimoto b570de30a9 Update CHANGELOG 2013-08-28 16:39:16 -07:00
Mitchell Hashimoto 5a18be1827 Merge pull request #2052 from janth/solaris11-guest
guests/solaris11: Added solaris11 guest plugin
2013-08-28 16:38:54 -07:00
Mitchell Hashimoto 76a15f8abc Update CHANGELOG 2013-08-28 16:38:07 -07:00
Mitchell Hashimoto 42f30fc501 Merge pull request #2058 from miketheman/chef_formatter_part_deux
provisioner/chef: fix formatter to work for Chef 10 and 11
2013-08-28 16:37:37 -07:00
Mitchell Hashimoto 7b21b42330 Update CHANGELOG 2013-08-28 16:33:19 -07:00
Mitchell Hashimoto 29aab20a9d core: nitpick the protocol forwarded port checking 2013-08-28 16:32:47 -07:00
Mitchell Hashimoto 44d65de076 Merge pull request #2059 from mlex/forward-tcp-and-udp-with-on-same-port-number
core: allow port-forwarding of the same port number but with different protocols [GH-1108]
2013-08-28 16:27:51 -07:00
Mitchell Hashimoto f8610418f4 Update CHANGELOG 2013-08-28 16:26:59 -07:00
Mitchell Hashimoto 53619daa74 Merge pull request #2086 from tsahara-iij/openbsd-caps
guests/openbsd: more capabilities for OpenBSD guest
2013-08-28 16:26:28 -07:00
Mitchell Hashimoto 4f27ad3d12 Update CHANGELOG 2013-08-28 16:25:18 -07:00
Mitchell Hashimoto 1a210e2c29 Merge pull request #2090 from miguno/GH-2087
plugins/hosts/fedora: support RHEL
2013-08-28 16:24:49 -07:00
Michael G. Noll 5058f351b1 GH-2087: Detect RHEL (Red Hat Enterprise Linux Server) properly 2013-08-28 09:19:08 +02:00
Michael G. Noll 95f5f553d9 GH-2088: Use proper regex capture group to detect OS version of RHEL family 2013-08-28 09:17:23 +02:00
Tomoyuki Sahara 91db685295 more capabilities for OpenBSD guest 2013-08-28 13:12:09 +09:00
Mitchell Hashimoto 2b3951b91c Merge pull request #2084 from glensc/fix-2a9d0c9
plugin/hosst/fedora: fix broken regexp from 2a9d0c9
2013-08-27 12:20:01 -07:00
Elan Ruusamäe fda6bf7bf7 fix broken regexp from 2a9d0c9 2013-08-27 22:16:37 +03:00
Michael Lex 172a5dac5a allow port-forwarding of the same port number but with different protocols [GH-1108] 2013-08-16 12:10:03 +02:00
Mike Fiedler a90ad18058 Updates Chef provisioner configuration option formatter for Chef 11
Refs #1250.

Will correctly produce the desired result on Chef 11.x and above, as the
original directive was written against Chef 10.x, and released in Vagrant 1.2.7.

While this will continue to work for Chef 10.x, since this is not the 'mainline'
release track, and the alternative would be to write more conditional code in
the configuration file to detect the version and place the correct directive, this
changes the directive to support the current releases of Chef 11 and above.
2013-08-15 22:35:01 -04:00
Jan Thomas Moldung 75c03726b9 Added solaris11 guest plugin 2013-08-14 16:10:18 +02:00
Ben Mabey bb3609e6b2 adds extra verbosity option to ansible provisioner 2013-08-12 09:31:54 -06:00
Mitchell Hashimoto e34cdbf86d Update CHANGELOG 2013-08-09 17:47:58 -07:00
Mitchell Hashimoto 2866476fb4 Merge pull request #2041 from Boohbah/arch-change-host-name
guests/arch: Use hostnamectl in cap/change_host_name.rb
2013-08-09 17:47:11 -07:00
Boohbah 903578269b Use hostnamectl in plugins/guests/arch/cap/change_host_name.rb 2013-08-10 00:41:18 +00:00
Mitchell Hashimoto 53f214c451 Merge pull request #2040 from timsutton/darwin-verify-vmware-hgfs
guests/darwin: Support verify_vmware_hgfs in darwin guest.
2013-08-09 12:05:09 -07:00
Timothy Sutton caaaa9fe28 Support verify_vmware_hgfs in darwin guest. 2013-08-09 15:00:38 -04:00
Mitchell Hashimoto b6ec723426 Update CHANGELOG 2013-08-09 11:53:58 -07:00
Mitchell Hashimoto 3b1a314117 Merge pull request #2015 from flozano/master
provisioners/puppet: Puppet modules owned by root when mounted in sync'ed folder.
2013-08-09 11:53:00 -07:00
Mitchell Hashimoto d237bc0657 provisioners/ansible: properly quote vars with spaces [GH-1984] 2013-08-09 11:51:36 -07:00
Mitchell Hashimoto 471dc2dc7d core: strip newlines off of IDs [GH-2024] 2013-08-09 11:42:18 -07:00
Mitchell Hashimoto 7c9219fc18 Add --color to force color output [GH-2027] 2013-08-09 11:40:08 -07:00
Mitchell Hashimoto 602a5ce0b4 commands/plugin/install: nitpick on style
/cc @ipwnstuff - Just nitpicking and CCing you so you can see. I dislike
the "if (val = something)" syntax so I axed that. Then I simplified
logic a bit.
2013-08-09 11:26:39 -07:00
Mitchell Hashimoto cee97bc3a0 Update CHANGELOG 2013-08-09 11:25:13 -07:00
Mitchell Hashimoto 8e3422403f Merge pull request #1986 from ipwnstuff/feature/plugin-post-install-message
commands/plugin/install: Display a plugin's post install message if available
2013-08-09 11:24:19 -07:00
Mitchell Hashimoto b2b7fdcd38 Update CHANGELOG 2013-08-09 11:22:01 -07:00
Mitchell Hashimoto b2f32543d9 Merge pull request #1689 from philippfranke/master
guests/suse: Add ability to configure networks
2013-08-09 11:21:26 -07:00
Mitchell Hashimoto 59580e242f Update CHANGELOG 2013-08-09 11:18:25 -07:00
Mitchell Hashimoto 269f7c2cc6 Merge pull request #2007 from ches/ansible-exit-status
provisioners/ansible: Fix Ansible provisioner exit code reporting
2013-08-09 11:17:52 -07:00
Mitchell Hashimoto d88a6476ef Update CHANGELOG 2013-08-09 11:17:04 -07:00
Mitchell Hashimoto bb209bacc2 Merge pull request #2008 from gwenci/master
hosts/fedora: Update host.rb vagrant failing on CentOS 6
2013-08-09 11:16:30 -07:00
Mitchell Hashimoto 500c5fb869 Update CHANGELOG 2013-08-09 11:15:04 -07:00