Gilles Cornu
dde7f4697f
Merge branch 'gildegoma/review-6626'
...
Related to #6619 , #6626 and #6627
2015-12-03 21:52:34 +01:00
Gilles Cornu
8517014a99
provisioners/ansible: update inventory groups tests
...
With the introduction of inventory variables, group members provided as
String are not splitted (by ' ') into an array (instead of
auto-conversion to a single-item array).
2015-12-03 09:39:12 +01:00
Gilles Cornu
9867281971
provisioners/ansible: allow symbol in `groups` key
...
After c49a146467
, it makes even more sense
to support Symbol datatypes in `groups` option handling.
2015-12-03 09:34:53 +01:00
Mitchell Hashimoto
30d9e243bb
fix failing tests
2015-12-02 18:03:08 -08:00
Gilles Cornu
3dbcf5083c
provisioners/ansible(both) add more unit tests
...
Improve the test coverage of 'get_inventory_host_vars_string' method.
2015-12-02 08:42:44 +01:00
Gilles Cornu
c49a146467
provisioners/ansible(both): alias String-to-Symbol
...
String and Symbol types are different when used as a Hash key. By
default the Vagrant machine names are set in Symbol format, but users
may write their `host_vars` entries with String keys. This is a very
simple way to ensure smooth experience, without having to coerce the
data types during the config validation (e.g. with a library like
Hashie, which is currently not in the Vagrant dependencies)
See also:
- https://bugs.ruby-lang.org/issues/5964#note-17
- https://github.com/intridea/hashie#keyconversion
2015-12-02 08:37:41 +01:00
Christian Henz
a5dd61c450
Added test to expect host vars being inserted into inventory.
2015-12-01 18:56:28 +01:00
Christian Henz
3fbbfeb862
Expect group variables to be inserted in the test.
2015-12-01 18:56:28 +01:00
Seth Vargo
64ff69c64b
Only run cleanup tasks when they are defined on the provisioner
...
This helps with some confusion caused in GH-2538, since the output says:
> Running cleanup tasks for 'shell' provisioner...
But that's actually not true. It is running the cleanup tasks iff the
provisioner defined a cleanup task. This commit changes the
provisioner_cleanup middleware to only run cleanup tasks if the subclass
defines a cleanup task.
The reason we can't just check if the provisioner `respond_to?` the
`cleanup` method is because the parent provisioner base class (which
all provisioners inherit from) defines a blank cleanup method. This is
important because it means we never risk calling an unimplemented
cleanup function, and it also helps define the public API for a
provisioner.
2015-11-26 13:11:51 -05:00
Gilles Cornu
eaf918ec35
Merge branch 'gildegoma/5086-ansible-winrm' into master
2015-11-25 22:46:08 +01:00
Seth Vargo
2221a1dc8f
Merge pull request #6599 from legal90/test-linked-clone
...
Add acceptance test for linked clones
2015-11-25 15:41:22 -05:00
Mikhail Zholobov
3d4a133dce
Add acceptance test for linked clones
2015-11-25 00:23:19 +02:00
Seth Vargo
1bb9a48ae7
Fix cap test
2015-11-24 16:41:13 -05:00
Seth Vargo
3502042d96
Lol whitespace [ci skip]
2015-11-24 16:36:36 -05:00
Seth Vargo
050f8d4d71
Allow specifying the guest port search
2015-11-24 16:33:09 -05:00
Seth Vargo
beb84d3212
Move to I18n
2015-11-24 16:33:09 -05:00
Seth Vargo
063f60e593
Add `vagrant port` command
2015-11-24 16:33:08 -05:00
Seth Vargo
bd48d24825
Respect proxy envvars for login command
2015-11-23 20:19:45 -05:00
Seth Vargo
8f420837a4
Escape identify file path
2015-11-23 20:00:12 -05:00
Seth Vargo
eaf0aeb210
Fix test
2015-11-23 19:35:03 -05:00
Seth Vargo
930e166b47
Add :env option to shell provisioner
2015-11-23 19:29:35 -05:00
Seth Vargo
8c3f833e8e
Use the new presence helpers in the Chef provisioner
2015-11-23 18:33:47 -05:00
Seth Vargo
4c55c39b2d
Add presence helpers
2015-11-23 18:04:18 -05:00
Seth Vargo
844cca9013
Skip nil IP addresses in ipv6 fix
...
Fixes GH-6558
2015-11-23 17:20:20 -05:00
Seth Vargo
7b89ecc230
Add public_address cap for VirtualBox
...
Fixes GH-5978
2015-11-23 16:23:22 -05:00
Mitchell Hashimoto
2875928b76
remove failing test that was brittle
2015-11-23 12:11:48 -08:00
Shawn Neal
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
Mitchell Hashimoto
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
Gilles Cornu
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
Gilles Cornu
e4ff8ee398
provisioners/ansible: fix a typo in rspec example
...
[ci skip] good morning @gildegoma!!!
2015-11-23 09:12:56 +01:00
Gilles Cornu
ef66098472
provisioners/ansible: fix a typo in rspec example
...
[ci skip]
2015-11-23 09:10:28 +01:00
Gilles Cornu
de96b54272
provisioners/ansible: full test coverage of winrm
...
At the moment, the vagrant ssh username is used as default username when
force_remote_user option is disabled, even for winrm-communiating
machines. This could be improved in the future, but people hitting this
problem can easily work around it by syncing `config.ssh.unsername` and
`config.winrm.username` in their Vagrantfile.
ref #5086
2015-11-23 09:05:36 +01:00
Gilles Cornu
e2f0d2ebb7
provisioners/ansible: add a unit test for winrm
...
ref #5086
2015-11-22 20:48:21 +01:00
Mitchell Hashimoto
d5fa7416ff
core: more heuristics for determining Cygwin
2015-11-21 11:17:36 -08:00
Gilles Cornu
2789ce61e0
Merge branch 'gildegoma/2718-ansible-galaxy' into master
2015-11-21 05:21:41 +01:00
Mitchell Hashimoto
edcaafacb1
not sure how this happens but travis told us so
2015-11-20 15:29:28 -08:00
Mitchell Hashimoto
e1f8b0d9c0
more passing tests on Windows
2015-11-20 15:24:51 -08:00
Mitchell Hashimoto
684410836c
use temporary files to avoid permission errors on Windows
2015-11-20 15:18:41 -08:00
Mitchell Hashimoto
9dc04b648c
skip box add tests on Windows
2015-11-20 15:15:04 -08:00
Mitchell Hashimoto
685f6d7e19
ansible tests passing on Windows
2015-11-20 15:13:35 -08:00
Mitchell Hashimoto
fafd8b8986
more passing tests on Windows
2015-11-20 15:09:17 -08:00
Mitchell Hashimoto
27412e6ee9
core: fix some failing Windows tests
2015-11-20 14:54:38 -08:00
Mitchell Hashimoto
9c1b014536
core: remove saved synced folders not from Vagrantfile
2015-11-20 10:25:09 -08:00
Seth Vargo
f5a0c3ed5b
Deprecate docker.version
2015-11-19 18:37:57 -08:00
Seth Vargo
20940d1a2f
Use subprocess as a poor-man's exec for local-exec
...
Fixes GH-5307
2015-11-19 17:03:39 -08:00
Mitchell Hashimoto
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
Mitchell Hashimoto
c541767949
core: add tests for box collection cleanup [GH-6002]
2015-11-19 15:59:58 -08:00
Seth Vargo
df207d2637
Require nodes_path for Chef Zero provisioning
...
Fixes GH-6110
2015-11-19 15:52:26 -08:00
Mitchell Hashimoto
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
Seth Vargo
c30467a6f9
Allow Chef to install on Windows
2015-11-19 15:01:09 -08:00
Seth Vargo
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
Seth Vargo
b8f200a4c1
Only force the formatter if we are on Chef 11 or higher
...
Fixes GH-6278
2015-11-19 11:48:04 -08:00
Seth Vargo
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
Mitchell Hashimoto
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
Mitchell Hashimoto
f5273c5409
push/heroku: use correct current branch [GH-6123]
2015-11-19 11:17:48 -08:00
Seth Vargo
aaed7c178f
Add tests
2015-11-19 11:07:19 -08:00
Seth Vargo
c1623ee740
Fix port collision in tests
2015-11-18 18:47:19 -08:00
Seth Vargo
a0c049da00
Fix tests
2015-11-18 18:32:46 -08:00
Mitchell Hashimoto
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
Mitchell Hashimoto
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
Mitchell Hashimoto
646414b347
core: don't make dotfile path if no Vagrantfile
2015-11-18 17:48:24 -08:00
Mitchell Hashimoto
0e32612324
fix more tests
2015-11-18 17:13:47 -08:00
Mitchell Hashimoto
c76e45a75a
fix some tests
2015-11-18 17:11:05 -08:00
Mitchell Hashimoto
891c47c742
core: don't do HEAD request for box on non-HTTP [GH-5477]
2015-11-18 16:52:40 -08:00
Seth Vargo
244069d5d7
Merge pull request #6049 from bdwyertech/bdwyertech-patch-2
...
Chef Zero - Fix 'nodes_path' Support
2015-11-18 16:46:02 -08:00
Mitchell Hashimoto
1a7937ed50
core: don't replace insecure key on base package [GH-5310]
2015-11-18 16:25:07 -08:00
Mitchell Hashimoto
da116bffec
fix syntax error
2015-11-18 15:57:58 -08:00
Mitchell Hashimoto
85f1e05e2a
core: prune machine if non-existent CWD from index [GH-4742]
2015-11-18 15:48:59 -08:00
Mitchell Hashimoto
d657804f18
Merge branch 'master' of https://github.com/matthewcodes/vagrant into matthewcodes-master
2015-11-18 15:09:47 -08:00
Seng Lin Shee
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
Mitchell Hashimoto
d3bcc4e5f9
Merge pull request #6213 from jrob/winrm-execution-timeout
...
Winrm execution timeout
2015-11-18 13:00:59 -08:00
Mitchell Hashimoto
e6098f6c4f
rename to powershell_elevated_interactive
2015-11-18 12:51:18 -08:00
Mitchell Hashimoto
37940e7350
Merge pull request #6185 from marc-ta/elevated_interactive
...
Elevated interactive
2015-11-18 12:46:39 -08:00
Mitchell Hashimoto
fedc7e21b3
provisioners/salt: deprecate config_dir
2015-11-18 11:56:07 -08:00
Mitchell Hashimoto
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
Seth Vargo
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
Gilles Cornu
c1f3d114f5
provisioners/ansible(both): add galaxy support
...
Close #2718
2015-11-17 22:08:29 +01:00
Gilles Cornu
b9738a8c4c
provisioners/ansible: add missing unit test
...
Related to #5292
2015-11-17 22:08:18 +01:00
Gilles Cornu
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
Duncan Mac-Vicar P
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
Gilles Cornu
a3c077cbe0
Merge branch 'gildegoma/ansible-force-ssh-user'
...
Resolved conflicts in
plugins/provisioners/ansible/config.rb
plugins/provisioners/ansible/provisioner.rb
test/unit/plugins/provisioners/ansible/provisioner_test.rb
website/docs/source/v2/provisioning/ansible.html.md
ref #6348
2015-11-08 14:01:23 +01:00
Gilles Cornu
9bfdaf7e75
provisioners/ansible: introduce ansible_local
...
With this change, the existing host-based Ansible provisioner is
refactored to share a maximum of code with this new guest-based Ansible
provisioner.
At this stage of development, the existing unit tests are intentionally
modified as little as possible, to keep safe the existing funtionalities.
Other issues resolved by this changeset:
- Display a warning when running from a Windows host [GH-5292]
- Do not run `ansible-playbook` in verbose mode when the `verbose` option
is set to an empty string.
2015-11-08 10:42:48 +01:00
Mitchell Hashimoto
69d9bc0fe8
Environment can_install_provider and install_provider
2015-11-05 11:50:10 -08:00
Mitchell Hashimoto
72e13ee9ef
test: add tests for provider command
2015-11-04 14:26:22 -08:00
Gilles Cornu
dde94a3ce7
provisioners/ansible: add force_remote_user option
...
The benefits of the following "breaking change" are the following:
- default behaviour naturally fits with most common usage (i.e. always
connect with Vagrant SSH settings)
- the autogenerated inventory is more consistent by providing both the
SSH username and private key.
- no longer needed to explain how to override Ansible `remote_user` parameters
Important: With the `force_remote_user` option, people still can fall
back to the former behavior (prior to Vagrant 1.8.0), which means that
Vagrant integration capabilities are still quite open and flexible.
2015-11-02 09:03:15 +01:00
matthewcodes
cbb03a02d4
Updating tests to check for single quote
2015-10-28 16:46:43 +00:00
Mitchell Hashimoto
32e981ce7c
core: machine-readable output should include standard UI output
...
As a "ui" type
2015-10-26 18:10:26 -07:00
Dan Dunckel
9d87be51da
Small refactor on conditional check and add tests
2015-10-15 12:25:50 -07:00
Seth Vargo
c88d52082a
Merge pull request #6296 from tomfanning/master
...
Hyper-V set mac address
2015-10-14 13:02:53 -04:00
Mitchell Hashimoto
5e48d35911
Merge pull request #6229 from mitchellh/b-winrm-info-respect-timeout
...
communicators/winrm: respect boot_timeout when fetching winrm_info
2015-10-12 15:50:05 -04:00
Mitchell Hashimoto
06f8595bc0
kernel/v2: clone option
2015-10-08 11:59:09 -04:00
Mitchell Hashimoto
ec0326f1c8
Merge pull request #6377 from mitchellh/f-cap-command
...
"cap" command
2015-10-08 10:52:14 -04:00
Mitchell Hashimoto
99d29f17fa
commands/cap
2015-10-08 10:35:36 -04:00
Mitchell Hashimoto
31ae00cfc3
test: more tests for snapshots
2015-10-08 09:10:55 -04:00
Mitchell Hashimoto
cc8cdafdc3
test: test for IsEnvSet
2015-10-07 22:54:27 -04:00
Mitchell Hashimoto
199a58fdd9
test: test IPv6
2015-10-01 08:47:25 -04:00
Mitchell Hashimoto
7e18a92bd9
test: fix tests
2015-10-01 08:45:44 -04:00
Mitchell Hashimoto
ec0b0fb7f9
providers/virtualbox: IPv6 host only networks
2015-09-30 17:23:25 -07:00
Brian Dwyer
c23610d703
Update test
2015-09-27 23:24:01 -04:00
tomfanning
41beaac074
Hyper-V set mac address
2015-09-22 11:35:55 +01:00