Commit Graph

2237 Commits

Author SHA1 Message Date
Michael Lopez 74ffcb27d6 Add 'enable_reporting' attribute for chef provisioner 2015-02-14 22:28:32 +01:00
Timothy Sutton c6e16beaa5 Support insert_public_key and remove_public_key on darwin guest
- fixes #5204
- darwin-specific sed arguments thanks to @elatt
2015-02-11 12:21:23 -05:00
Frank Baalbergen 90719dc82f vagrant duplicates >= eth2 when defining two config.vm.network :private_network
When a vagrant box has two private network ips /etc/network/interfaces
will duplicate eth2 and bigger. sed matches greedy, so the first
 #VAGRANT-END matches. This will result in:

/etc/network/interfaces:29: interface eth2 declared allow-auto twice
/sbin/ifup: couldn't read interfaces file "/etc/network/interfaces"
2015-02-11 15:37:41 +01:00
Hugues Lismonde 887f94260e Support Regexp usage for bridge configuration 2015-02-11 11:07:03 +01:00
Jimmi Dyson be2643d40d Only add user to docker group if docker group exists (doesn't in recent Fedora docker-io installs) 2015-02-10 18:11:39 +00:00
Max Lincoln d6e91483a6 Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
Conflicts:
	vagrant.gemspec
2015-02-09 11:10:23 -05:00
Schneider Werner-Walter 02c0bfafc6 Add Scientific Linux to RHEL 7 flavors. 2015-02-08 02:56:44 +02:00
cubetto 2e659bf12c Update host_machine_build_dir.rb 2015-02-07 20:33:55 -03:00
Christopher Chan-Nui a6361a750c Copy linux support for insert_public_key and remove_public_key to solaris11. 2015-02-04 16:58:17 -06:00
Seth Vargo 7d25a687ca Add tests for sending metadata 2015-02-04 11:45:02 -05:00
Seth Vargo 257ff57772 Remove message for now 2015-02-03 21:06:51 -05:00
Seth Vargo 82b24e9a8f Pass in a message to the command as well 2015-02-03 19:20:27 -05:00
Seth Vargo d29a474fbb Cleanup that syntax 2015-02-03 19:20:12 -05:00
Seth Vargo edbc3e74d4 Pass metadata to push command 2015-02-03 19:19:51 -05:00
Seth Vargo 52d0df3296 Add --message option to `vagrant push` 2015-02-03 19:19:08 -05:00
Félix Bellanger b776fe74b8 detect fedora 21 2015-02-03 10:23:35 +01:00
Blair Hamilton 7784ee2d09 Revert "Rename Windows guest without reboot" 2015-01-28 20:00:24 -05:00
Max Lincoln 39882957ee Add retry_delay setting to speed up test 2015-01-28 13:41:07 -05:00
Max Lincoln 5d5e13bc0f Change authorization error tests to match WinRM 1.3 2015-01-28 13:41:07 -05:00
Richard Guin 56a6c85e7d Windows rsync needs to create folders before syncing 2015-01-28 13:07:36 -05:00
Max Lincoln c37c12526a Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling
Conflicts:
	vagrant.gemspec
2015-01-28 10:44:47 -05:00
Shawn Neal 6378deacd6 Merge pull request #5225 from mitchellh/winrm-fs-dependency
Use winrm-fs for file uploads
2015-01-26 09:55:31 -08:00
Paul Hinze 88ab9f7402 providers/virtualbox: read netmask from dhcpservers
This should fix the cleaning up of the default VirtualBox dhcpserver,
which we've been fighting with for ages over in #3083. We were checking
for a structure _including_ a netmask, but the driver was not populating
netmask.
2015-01-21 10:51:39 -08:00
Max Lincoln 29845e926c Merge branch 'master' into winrm_error_handling 2015-01-20 16:16:48 -05:00
Max Lincoln edc867986b Merge branch 'master' into winrm_error_handling 2015-01-20 16:07:00 -05:00
Max Lincoln e07f229f6e Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl 2015-01-20 16:00:20 -05:00
Shawn Neal 31163da0d5 Use winrm-fs for file uploads
Replace the Vagrant native winrm file upload functionality with the winrm-fs gem.
2015-01-20 11:45:57 -08:00
Seth Vargo 0cfe5ebfa6 Merge pull request #5222 from simonjbeaumont/fix-regex
Allow colon in NFS ID regex
2015-01-20 09:58:31 -05:00
Seth Vargo 8519e174f0 Merge pull request #5220 from voxik/fix-permissions
Remove unneeded executable permissions.
2015-01-20 09:53:48 -05:00
Si Beaumont 3deed353ae Allow colon in NFS ID regex
Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
2015-01-20 14:11:42 +00:00
Vít Ondruch 7d3b5352da Remove unneeded executable permissions. 2015-01-20 11:53:30 +01:00
Clay Allsopp 69b7200c35 Switch to docker.com
docker.io seems to be deprecated & handled differently from docker.com; see https://twitter.com/clint_newsom/status/557290529810313217
2015-01-19 13:58:45 -08:00
Tomas Srnka 21e2f33fb0 Fix for: [hyperv]: VM import process does not respect Secure Boot option from image #5209 2015-01-17 21:31:37 +01:00
Matt Wrock 87195f8336 use :bridge instead of network_name to align with site docs 2015-01-17 11:39:32 -08:00
Matt Wrock 0b6e65380a select a switch ased on a network_name 2015-01-17 01:06:56 -08:00
Volodymyr Babchynskyy a9ac168b19 Added possibility to configure memory, cpus count, and vmname in vagrantfile 2015-01-14 16:59:01 +02:00
Clinton Wolfe 75de0e3dd7 Add insert/remove public key guest capability for solaris (identical to linux) 2015-01-13 21:45:06 -05:00
Clinton Wolfe 17a0d08040 Add chef_install(ed?) guest capability for omnios 2015-01-13 17:45:01 -05:00
Gilles Cornu cdd5d54208 provisioners/ansible: fix a typo in a comment
[ci skip]
2015-01-13 18:52:47 +01:00
Hubert 7e5391c0f5 synced/folders/rsync Add 'IdentitiesOnly=yes'
Added IdentiesOnly=yes to avoid "Too Many Authentication Failures" error
2015-01-12 15:19:43 +01:00
Gilles Cornu 28e0646dc2 Fix typo error in CHANGELOG
Close #4860

[ci skip]
2015-01-12 10:59:07 +01:00
Gilles Cornu 2ecad8bb93 provisioners/ansible: increase connection timeout
This change helps to avoid troubles like reported in #5018 and #4860.

Note that for sake of configuration simplicity, no new `ansible.timeout`
option has been added. The users who want to set a different value can
rely on `ansible.raw_arguments`.
2015-01-12 10:54:01 +01:00
Gilles Cornu c3cae3d235 provisioners/ansible: add `IdentitiesOnly=yes`
This SSH option is always set, except when Vagrant is running from an
operating system fo the Solaris-family, as this parameter is not
supported by SunSSH. Logic taken from
bed1f8335f/lib/vagrant/util/ssh.rb (L116-L121)

Fix #5017
2015-01-12 08:58:29 +01:00
Seth Vargo 114858c7d2 Verify the token is valid when saving 2015-01-09 13:24:53 -05:00
Seth Vargo 253f0637e5 Add a -t command for setting the login token 2015-01-08 17:16:21 -05:00
Dan Carley 7529b66ea2 Disable insert_key for boot2docker host
Vagrant >1.7 is unable to login to the default boot2docker host if it has
been halted and brought back up again.

This is because the insecure SSH keypair is replaced but boot2docker doesn't
persist filesystem changes between reboots. So when next brought up Vagrant
tries to use the new keypair which is no longer valid and subsequently isn't
able to login.

Prevent this from happening by disabling the `ssh.insert_key` option on
versions where it is available.
2015-01-08 11:23:37 +00:00
Seth Vargo 39233e802f Validate pushes in the global config 2015-01-07 15:51:20 -05:00
Seth Vargo 6b51526ba2 Validate push configuration in the environment 2015-01-07 11:43:26 -05:00
Seth Vargo e828719c2f Add logging to vagrant-login 2015-01-07 11:43:14 -05:00
Mitchell Hashimoto 95e1c19f22 provisioners/puppet: fix exception with module paths [GH-5123] 2015-01-06 22:50:24 -08:00
Seth Vargo 1fdee9e5c4 Merge pull request #4813 from derdanne/funtoo-guest-network-configuration
Update configure_networks.rb for funtoo
2015-01-06 16:49:44 -05:00
Mitchell Hashimoto 661657c63f provisioners/chef: fix failing test 2015-01-06 10:57:25 -08:00
Mitchell Hashimoto 5b4b387f04 provisioners/chef: fix failing tests 2015-01-06 10:56:28 -08:00
Mitchell Hashimoto de6b55d007 provisioners/puppet: use predictable synced folders 2015-01-06 10:48:31 -08:00
Mitchell Hashimoto 155516fb6c provisioners/chef: use synced folder cache instead of counter 2015-01-06 10:31:13 -08:00
Mitchell Hashimoto 79873cdb44 communicators/winrm: detect parse errors in powershell and error
/cc @sneal - Any better way to do this?
2015-01-05 16:53:17 -08:00
Seth Vargo 7609932a6f Do not use keyword arguments for string keys 2015-01-05 18:58:57 -05:00
Seth Vargo d2874064f4 Use .key? instead of .has_key? 2015-01-05 18:29:01 -05:00
Seth Vargo 5e0f91f592 ENV returns nil, not empty strings 2015-01-05 16:04:00 -05:00
Seth Vargo 2bd22c9663 Turn on Atlas debug logging if Vagrant is logging 2015-01-05 15:51:19 -05:00
Mitchell Hashimoto c4502737c8 Revert "Symbolize and stringify keys in options hash"
This reverts commit 1699c92eec.
2015-01-05 12:35:31 -08:00
Mitchell Hashimoto d5dae4b492 Merge pull request #5042 from legal90/fix-post-comm
providers/virtualbox: Add 'post-comm' to the list of valid events
2015-01-05 12:00:34 -08:00
Mitchell Hashimoto d482e0ca10 Merge pull request #5085 from evverx/provision-with
Enable provision with --provision-with flag
2015-01-05 11:45:10 -08:00
Mitchell Hashimoto 4849ec8f7c guests/solaris: merge config properly [GH-5092] 2015-01-05 09:52:19 -08:00
Mitchell Hashimoto d5c1c28a2b Merge pull request #5094 from wkolean/docker-vbox-symlink-fix
enable symlinks before adding shared folder
2015-01-05 09:49:56 -08:00
Mitchell Hashimoto 9ce626854d Merge pull request #5102 from tomassrnka/master
Fix catching "Start-VM" exceptions on Hyper-V during starting up VM
2015-01-05 09:44:01 -08:00
Seth Vargo 1699c92eec Symbolize and stringify keys in options hash 2015-01-05 10:48:39 -05:00
Mitchell Hashimoto 5903bfb3c6 commands/push: validate configuration
/cc @sethvargo - Some weirdness here but overall should work fine. I'm
not sure if there was a GH issue this should be attached to or close. To
explain:

We just use the first machine with the default provider. A
Vagrant::Environment guarantees there is at least one machine, so
`env.machine_names.first` will always work. And we can just use the
default provider because we don't really care. Finally, it can be any
old machine we pass in because we just want the "global" config to
validate and there is no way to say "don't validate machine-specific
configs", so we might as well just pick the first machine to validate.
2015-01-04 15:43:30 -08:00
Seth Vargo f11ec8ff1a Make parent directories when uploading to FTP 2015-01-04 18:06:51 -05:00
Seth Vargo 6a3d99a9a2 Output to the UI when uploading via FTP 2015-01-04 18:06:32 -05:00
Seth Vargo 50c1c0756e Expand file paths relative to the root_path 2015-01-04 18:06:22 -05:00
Seth Vargo fd3c1c6ebb Add a logger when uploading to FTP 2015-01-04 18:06:05 -05:00
Seth Vargo e330875303 Exclude certain directories by default 2015-01-04 18:05:46 -05:00
Seth Vargo e7391359e8 Remove duplicate #parse_host method 2015-01-04 18:05:17 -05:00
Seth Vargo 944853ab47 Use 21 for the default port 2015-01-04 16:24:26 -05:00
Tomas Srnka 2620042c26 Fix catching "Start-VM" exceptions on Hyper-V during starting up VM 2015-01-04 00:05:50 +01:00
William Kolean 084d2c06de enable symlinks before adding shared folder 2015-01-01 16:00:17 -05:00
Evgeny Vereshchagin 43bb715c00 Enable provision with --provision-with flag 2014-12-30 06:10:52 +03:00
Seth Vargo 97d5a6ebfc Log chef-zero instead of chef-solo 2014-12-28 12:52:54 -05:00
evverx 1cfc5acea3 Update Chef plugin description 2014-12-24 03:53:29 +03:00
Masahiro Ono 55a90445cd Fix new-style Network Device Naming on CentOS7+VMwarefusion 2014-12-21 16:25:11 +09:00
Mikhail Zholobov e828927cee providers/virtualbox: Add 'post-comm' to the list of valid events 2014-12-21 01:09:55 +03:00
Seth Vargo 5efb30653e Merge pull request #4898 from athak/patch-solaris-rsync
rsynced folders don't work with Solaris based OS
2014-12-18 10:30:13 -05:00
Torben Knerr f2b494c2cc don't forget to pass the `installer_download_path` from the config! 2014-12-17 00:48:34 +01:00
Torben Knerr acc4e3806f pass the `download_path` parameter to the `:chef_install` capability so it is available when `Omnibus.build_command(..)` is invoked 2014-12-16 23:40:22 +01:00
Torben Knerr d7bd65b4e2 extend the omnibus command builder with an additional download_path parameter 2014-12-16 23:29:47 +01:00
Torben Knerr 9e7f705bad extend the Chef provisioner base config object with an 'installer_download_path' property 2014-12-16 22:40:19 +01:00
Shawn Neal 2785fd14db Merge pull request #4996 from mitchellh/4976-fix-guest-autodetection-with-windows-guests
4976 fix guest autodetection with windows guests
2014-12-16 11:47:05 -08:00
Seth Vargo 954289beb6 Use new Chef Omnibus URL 2014-12-16 12:16:08 -05:00
Shawn Neal c4422d7c70 Fix guest autodetection when running windows guests so Vagrant doesn't think the guest is Ubuntu 2014-12-16 08:20:01 -08:00
Barry Kelly 185740163c Don't reorder config in /etc/network/interfaces 2014-12-15 19:21:22 +00:00
Seth Vargo bce0d1acc9 Pushes are strings 2014-12-15 01:29:58 -05:00
Mitchell Hashimoto 4efb401050 kernel/v2: push config keys on strategy
/cc @sethvargo - This adds more tests that fail if this change isn't in
place.
2014-12-14 22:24:14 -08:00
Seth Vargo 8c8a92c4be Merge pull request #4896 from analyzere/salt-grains-config
Issue #4895: Support grains config for salt
2014-12-14 23:48:02 -05:00
Seth Vargo c0d4b39eea Force opts to be options
cb6f3e5 introduced a change to the method airty of machine actions to remove the
`extra_env` attribute.

- Fixes #4960
2014-12-14 23:46:39 -05:00
Seth Vargo 214a79e057 Pushes are hashed by name, not strategy.
@mitchellh this is a partial revert of 84ae22e. It took me a little bit
to figure out why this broke everything, but then I finally realized it.

84ae22e changes the finalize! function to lookup pushes by strategy
type, but pushes are keyed by push strategy name. In other words, given:

    config.push.define("foo", strategy: "bar")

the `push_configs` has will look like:


    { :foo => [:bar, #<PushConfig>] }

This is important, because if we key by strategy, the user cannot 
specify the same push strategy more than once:

    config.push.define("foo", strategy: "bar")
    config.push.define("zip", strategy: "bar")

If we keyed off of the strategy, this would be impossible.
2014-12-14 23:32:32 -05:00
Douézan-Grard Guillaume 9d1834a3c9 Fix line breaks 2014-12-13 21:08:31 +01:00
Mitchell Hashimoto fdd7bc3ffd commands/login: append access token to vagrantcloud => atlas URLs 2014-12-12 14:53:05 -08:00
Mitchell Hashimoto 84ae22e976 kernel/v2: fix push strategy config lookup 2014-12-12 01:36:39 -08:00
Mitchell Hashimoto 669c9fc013 commands/push: push strategy should be string 2014-12-12 01:27:22 -08:00