Commit Graph

644 Commits

Author SHA1 Message Date
Mitchell Hashimoto d4c7e20110 core: ProvisionerCleanup task to run cleanup on provisioners 2013-08-29 11:13:43 -07:00
Mitchell Hashimoto 93c98aad01 Merge branch 'pr/1267'
Conflicts:
	plugins/provisioners/chef/provisioner/chef_client.rb
2013-08-29 10:50:50 -07:00
Mitchell Hashimoto 50fdf1358c communicators/ssh: handle closed connection without exception 2013-08-29 10:36:23 -07:00
Mitchell Hashimoto 54ac2e8448 Merge pull request #1713 from akalyaev/respect-nec-type-option-for-private-networks-1704
core: respect :nic_type option for private network. Fixes #1704
2013-08-28 22:44:20 -07:00
Mitchell Hashimoto 349b2507f9 Merge branch 'unpriv_shell' of https://github.com/frsantos/vagrant into frsantos-unpriv_shell
Conflicts:
	plugins/provisioners/shell/config.rb
	plugins/provisioners/shell/provisioner.rb
2013-08-28 22:29:49 -07:00
Mitchell Hashimoto 0e9711d0dd kernel: config.vm.host_name works again 2013-08-28 17:17:07 -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 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 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 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 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 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
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
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
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
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 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 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 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 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 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 0dfeec4fae Merge pull request #2016 from mcourtois/fix/master/status_cosmetic
commands/status: Cosmetic fix to align machine name and states in the status command
2013-08-09 11:14:15 -07:00
Mitchell Hashimoto 8e065abf3c Merge pull request #2026 from ppp0/patch-set-hostname-debian
plugins/guests/debian: Forcing eth0 to come up
2013-08-09 11:11:57 -07:00
Mitchell Hashimoto 17ecd05c5f plugins/provisioners/ansible: rename inventory_file to inventory_path
/cc @ches
2013-08-09 11:06:02 -07:00
Mitchell Hashimoto ac8b2c5047 plugins/provisioners/ansible: use exist? check
/cc @ches
2013-08-09 11:04:35 -07:00
Mitchell Hashimoto 15142704eb Merge pull request #2035 from ches/ansible-inventory-directories
Ansible inventory can be a directory, not just a file
2013-08-09 11:03:52 -07:00
Mitchell Hashimoto d24caac5ae Merge pull request #1914 from b2jrock/darwin-guest
OS X (darwin) guest support.
2013-08-09 10:53:29 -07:00
Ches Martin c38855f8c1 Ansible inventory can be a directory, not just a file
It is an under-documented feature that one can specify a directory as
the Ansible inventory source, not just a single file. In that case,
Ansible merges the contents of flat files and any executable inventory
plugins found in the directory.

This is useful, for instance, to put localhost in your inventory for use
with `local_action` even if your entire infrastructure is otherwise on
EC2 or some other dynamic inventory source. I also use a flat file to
create aliases for host groups automatically generated from the EC2 API,
like "staging" for `tag_Environment_staging`.
2013-08-09 01:26:04 +07:00
Timothy Sutton 23962baac9 Darwin: use :sudo for communicate.test 2013-08-07 17:10:32 -04:00
Timothy Sutton a3b9428f67 Darwin: code debug cleanup 2013-08-06 10:18:38 -04:00
Timothy Sutton 8b925e6c15 Update Darwin guest description 2013-08-06 10:18:12 -04:00
Timothy Sutton 78ec8b5809 Darwin: clean up temporary network interface file downloaded from guest 2013-08-06 10:17:52 -04:00
Timothy Sutton 300d151608 Darwin guest: mount_vmware_shared_folder cap for use with vmware_fusion provider
- It's not clear whether it's possible to mount individual shares
  using 'mount -t vmhgfs', as the vagrant-vmware-fusion provider now does
  for Linux guests. Any mount from '.host', even if not a valid share
  name, succeeds and mounts _all_ shares in their respective directories
  at the root of the mountpoint. Instead, we symlink each directory from
  its place in '/Volumes/VMware Shared Folders'
2013-08-06 10:17:12 -04:00
Brian Johnson 7d0a92c5b4 Remove the +1 offset, I resolved the issue with the 'phantom' en1
interface. For some reason interfaces still skip en1, but provided we
enumerate based on order and not name, things should work smoothly.
2013-08-05 18:45:42 -07:00
Brian Johnson e5ce19ff11 Tabs must die. 2013-08-05 18:07:45 -07:00
Brian Johnson 3611ff39f4 Change mount_nfs_folder cap to be more like the linux version, adding a
bunch of retires rather than a long sleep.

Add DarwinNFSMountFailed error. This might move be more appropriate at
the plugin level.

Integrate some of tvsutton's work in configure_networks to get the
implementation closer to working in both fusion and virtualbox.

Add shell_expand_guest_path capability (also copied from linux)
2013-08-05 17:39:44 -07:00
Philipp Gysin b6f2443bd5 Forcing eth0 to come up 2013-08-05 18:02:12 +02:00