beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,656 Commits 2 Branches 273 Tags
Commit Graph

5519 Commits

Author SHA1 Message Date
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
Mitchell Hashimoto
e212b31394 Merge pull request #4905 from mitchellh/gc-fix-docker-agent-forwarding 
providers/docker: fix support of agent forwarding
 2014-12-11 17:21:59 -08:00
Mitchell Hashimoto
a3a41fe3bc Merge pull request #4906 from mitchellh/gc-4071-docker-ansible 
provisioners/ansible: use Docker proxy when needed
 2014-12-11 17:20:41 -08:00
Seth Vargo
6596f7f29d Merge pull request #4937 from mitchellh/sethvargo/error_format 
Use the new Rails error format
 2014-12-11 16:54:45 -08:00
Max Lincoln
3e8fdc0ca4 WinRM SSL support 2014-12-11 15:07:34 -05:00
Max Lincoln
0b30dcd078 Merge branch 'winrmssl' into winrm_error_handling 
Conflicts:
	test/unit/plugins/communicators/winrm/shell_test.rb
 2014-12-11 14:11:06 -05:00
Max Lincoln
234adaae63 WinRM SSL support 2014-12-11 14:09:17 -05:00
Max Lincoln
b5a9477405 Fix default forwarded ports 2014-12-11 13:39:24 -05:00
Max Lincoln
e7e50d39d9 Fix tests - all pass but auth retry test is extremely slow 2014-12-11 13:23:40 -05:00
Max Lincoln
24de8a1fb7 Just use ready? 2014-12-11 13:22:39 -05:00
Max Lincoln
ba7b964b1e Better error handling for WinRM (using winrm v1.3.0.dev.2) 2014-12-11 13:22:39 -05:00
Max Lincoln
24f919c4d3 Fix accessors used by in communicator.rb 2014-12-11 13:22:39 -05:00
Max Lincoln
62ddd92768 Only forward one port for winrm 2014-12-11 13:22:39 -05:00
Max Lincoln
2caaf82ae0 Change default transport back to :plaintext, for backwards compatibility 2014-12-11 13:21:58 -05:00
Max Lincoln
02f4adc895 Fix broken variable references 2014-12-11 13:21:58 -05:00
Max Lincoln
072bb26a30 Change @ssl to @transport 2014-12-11 13:21:58 -05:00
Max Lincoln
b3480049ad DRY the Shell: Don't duplicate the Config, especially since there were differing default values 2014-12-11 13:21:58 -05:00
Max Lincoln
1beb221bf3 Rename no_ssl_peer_verification to ssl_peer_verification, and make it configurable 2014-12-11 13:21:58 -05:00
Peter Ericson
243cc5dc37 config.rb: set default port based on @ssl 2014-12-11 13:20:22 -05:00
Peter Ericson
52d8fddf38 shell.rb: fix precedence 2014-12-11 13:20:22 -05:00
Peter Ericson
2f52a9c15c Add winrmssl port forward (port 5986) 2014-12-11 13:20:22 -05:00
Peter Ericson
4455d2401b Add ssl option to winrm config.rb 2014-12-11 13:19:09 -05:00
Peter Ericson
a99d32f60a Add WinRM over SSL support 2014-12-11 13:19:09 -05:00
Seth Vargo
9a575a79ec Use the new Rails error format 2014-12-11 01:21:46 -08:00
Seth Vargo
0506e17778 Update Atlas Push to use new vagrant-login API 2014-12-10 15:11:04 -08:00
Seth Vargo
7d6a6cd263 Read the ATLAS_TOKEN in vagrant-login 2014-12-10 15:08:43 -08:00
Mitchell Hashimoto
ed688ec775 Merge pull request #4929 from kalifg/master 
Add back creation of mount point
 2014-12-10 09:18:42 -08:00
Mitchell Hashimoto
2a285d7655 hosts/bad: escape regexp properly [GH-4922] 2014-12-10 09:16:45 -08:00
Michael Dwyer
e65ae7b543 Add back creation of mount point 
Accidentally removed in ad4b30dd
 2014-12-10 10:56:30 -06:00
Mitchell Hashimoto
02a615a646 Merge remote-tracking branch 'upcoming/master' 2014-12-09 16:18:18 -08:00
Seth Vargo
bb7b954a5f Use the new namespace in Atlas config 2014-12-08 22:06:41 -08:00