c1acbec55e
Merge pull request #6581 from mitchellh/gildegoma/fix-winrm-ssl-portforwarding-overrides
...
"Split" the handling of WinRM port forwarding rules (plaintext, ssl)
2015-11-23 10:13:23 -08:00
7f93868c86
Merge pull request #6567 from mitchellh/b-prune-folders
...
core: remove saved synced folders not from Vagrantfile
2015-11-23 10:06:51 -08:00
68d9708ca7
kernel/v2: fix a bug in WinRM port forwarding
...
Without this change a custom "winrm-ssl" port forwarding rule
could be wrongly shadowed in absence of a "winrm" custom rule.
2015-11-23 18:51:12 +01:00
d5fa7416ff
core: more heuristics for determining Cygwin
2015-11-21 11:17:36 -08:00
2789ce61e0
Merge branch 'gildegoma/2718-ansible-galaxy' into master
2015-11-21 05:21:41 +01:00
edcaafacb1
not sure how this happens but travis told us so
2015-11-20 15:29:28 -08:00
e1f8b0d9c0
more passing tests on Windows
2015-11-20 15:24:51 -08:00
684410836c
use temporary files to avoid permission errors on Windows
2015-11-20 15:18:41 -08:00
9dc04b648c
skip box add tests on Windows
2015-11-20 15:15:04 -08:00
685f6d7e19
ansible tests passing on Windows
2015-11-20 15:13:35 -08:00
fafd8b8986
more passing tests on Windows
2015-11-20 15:09:17 -08:00
27412e6ee9
core: fix some failing Windows tests
2015-11-20 14:54:38 -08:00
9c1b014536
core: remove saved synced folders not from Vagrantfile
2015-11-20 10:25:09 -08:00
f5a0c3ed5b
Deprecate docker.version
2015-11-19 18:37:57 -08:00
20940d1a2f
Use subprocess as a poor-man's exec for local-exec
...
Fixes GH-5307
2015-11-19 17:03:39 -08:00
1ccd91aada
Merge pull request #4473 from rtkrruvinskiy/https_metadata
...
Add HTTPS download options to `box update` and `box outdated`
2015-11-19 16:16:48 -08:00
c541767949
core: add tests for box collection cleanup [GH-6002]
2015-11-19 15:59:58 -08:00
df207d2637
Require nodes_path for Chef Zero provisioning
...
Fixes GH-6110
2015-11-19 15:52:26 -08:00
ed9bc1e847
Merge branch '3570-box-data-left' of https://github.com/ievgenp/vagrant into ievgenp-3570-box-data-left
2015-11-19 15:45:47 -08:00
c30467a6f9
Allow Chef to install on Windows
2015-11-19 15:01:09 -08:00
a90e6cfe4c
Use the new Chef installation channel and options
...
This deprecates "prerelease", which will be removed in the next release.
2015-11-19 14:57:01 -08:00
b8f200a4c1
Only force the formatter if we are on Chef 11 or higher
...
Fixes GH-6278
2015-11-19 11:48:04 -08:00
9559fc549c
Automatically generate a node_name for Chef
...
This is required because the Chef Server almost always needs a node name to
interact. This will default to the hostname, but that's always going to be
`vagrant.vm`, which will collide easily.
This generates a random hostname with `vagrant-` as the prefix and stores the
result in the machine's data directory.
2015-11-19 11:38:33 -08:00
97021ceedd
Merge pull request #6554 from mitchellh/b-heroku-branch
...
push/heroku: use correct current branch [GH-6123]
2015-11-19 11:22:06 -08:00
f5273c5409
push/heroku: use correct current branch [GH-6123]
2015-11-19 11:17:48 -08:00
aaed7c178f
Add tests
2015-11-19 11:07:19 -08:00
c1623ee740
Fix port collision in tests
2015-11-18 18:47:19 -08:00
a0c049da00
Fix tests
2015-11-18 18:32:46 -08:00
be29915bed
Merge pull request #6542 from mitchellh/b-dotfile
...
core: don't make dotfile path if no Vagrantfile
2015-11-18 18:10:19 -08:00
079ee6ea95
Merge pull request #6540 from mitchellh/b-non-http-head
...
core: don't do HEAD request for box on non-HTTP [GH-5477]
2015-11-18 18:09:31 -08:00
646414b347
core: don't make dotfile path if no Vagrantfile
2015-11-18 17:48:24 -08:00
0e32612324
fix more tests
2015-11-18 17:13:47 -08:00
c76e45a75a
fix some tests
2015-11-18 17:11:05 -08:00
891c47c742
core: don't do HEAD request for box on non-HTTP [GH-5477]
2015-11-18 16:52:40 -08:00
244069d5d7
Merge pull request #6049 from bdwyertech/bdwyertech-patch-2
...
Chef Zero - Fix 'nodes_path' Support
2015-11-18 16:46:02 -08:00
1a7937ed50
core: don't replace insecure key on base package [GH-5310]
2015-11-18 16:25:07 -08:00
da116bffec
fix syntax error
2015-11-18 15:57:58 -08:00
85f1e05e2a
core: prune machine if non-existent CWD from index [GH-4742]
2015-11-18 15:48:59 -08:00
d657804f18
Merge branch 'master' of https://github.com/matthewcodes/vagrant into matthewcodes-master
2015-11-18 15:09:47 -08:00
f1647ddea6
Fixed unit test.
...
Command is now wrapped in more PowerShell scripts, changing its final encoded value.
2015-11-18 13:53:17 -08:00
d3bcc4e5f9
Merge pull request #6213 from jrob/winrm-execution-timeout
...
Winrm execution timeout
2015-11-18 13:00:59 -08:00
e6098f6c4f
rename to powershell_elevated_interactive
2015-11-18 12:51:18 -08:00
37940e7350
Merge pull request #6185 from marc-ta/elevated_interactive
...
Elevated interactive
2015-11-18 12:46:39 -08:00
fedc7e21b3
provisioners/salt: deprecate config_dir
2015-11-18 11:56:07 -08:00
f1827602f2
Merge pull request #6502 from dmacvicar/fix-dhcp-on-suse
...
SUSE-flavored systems use STARTMODE and not ONBOOT
2015-11-18 11:05:36 -08:00
ff95fc5c1e
Only append access_token the first time
...
This fixes GH-6395 by only appending the access_token once. It also fixes a
bug that was never reported. If a user supplied an access_token for a box URL,
Vagrant would silently overwrite it.
After this commit, Vagrant only appends an access_token to the URL if no
value exists at the key.
2015-11-18 10:44:35 -08:00
c1f3d114f5
provisioners/ansible(both): add galaxy support
...
Close #2718
2015-11-17 22:08:29 +01:00
b9738a8c4c
provisioners/ansible: add missing unit test
...
Related to #5292
2015-11-17 22:08:18 +01:00
a0576349fe
provisioners/ansible(both): reorganize i18n texts
...
These adaptations will make even more sense with the upcoming
introduction of `ansible-galaxy` support.
2015-11-17 22:08:18 +01:00
a21d5be705
SUSE-flavored systems uses STARTMODE and not ONBOOT
...
As described in /etc/sysconfig/network/ifcfg.template
Static template was already using the right one, but the dhcp configuration seems
to be copied from a Fedora/Redhat template.
This fixes the issue that the interface does not come up after reboot.
2015-11-08 16:09:04 +01:00
Shawn Neal
Mitchell Hashimoto
Gilles Cornu
Mitchell Hashimoto
Seth Vargo
Seng Lin Shee
Duncan Mac-Vicar P