b8f200a4c1
Only force the formatter if we are on Chef 11 or higher
...
Fixes GH-6278
2015-11-19 11:48:04 -08:00
c0a58fe5bd
Merge pull request #6555 from mitchellh/sethvargo/chef_delete
...
Automatically generate a node_name for Chef
2015-11-19 11:41:31 -08:00
4988298b0b
guests/arch: configure networks should enable device [GH-5737]
2015-11-19 11:39: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
270c0726df
Merge pull request #6552 from mitchellh/f-cache-vbox
...
providers/virtualbox: cache VirtualBox version [GH-6468]
2015-11-19 11:20:09 -08:00
a75b14b769
providers/virtualbox: wrap version set in mutex
2015-11-19 11:19:56 -08:00
f5273c5409
push/heroku: use correct current branch [GH-6123]
2015-11-19 11:17:48 -08:00
825bd6d5ef
Run provisioner cleanup tasks before destroying the VM
2015-11-19 11:14:31 -08:00
fb511a43d9
providers/virtualbox: store version on instance as well
2015-11-19 11:02:00 -08:00
d56c8fda18
providers/virtualbox: cache VirtualBox version [GH-6468]
2015-11-19 11:00:02 -08:00
c8a18fda26
Fixing the Salt bootstrap script for Windows
...
The URL for the download has changed as per issue #6274
2015-11-18 21:55:32 -06:00
f999218c53
Perform Chef delete operations on the guest instead of the host
2015-11-18 18:28:42 -08:00
eb5a6fc7c3
communicators/ssh: more nil guards [GH-6225]
2015-11-18 17:32:40 -08:00
6f3ed13f75
providers/virtualbox: run provisioners on suspend resume
2015-11-18 17:16:23 -08:00
925d7c5bf6
Revert "Make DHCP IP configurable"
...
This reverts commit 004fe0e7bb
2015-11-18 17:11:58 -08:00
a1a3824e35
Do not throw an error when the Chef node_name is nil
2015-11-18 16:56:31 -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
96a815e84e
Merge pull request #6538 from mitchellh/sethvargo/pr-6325
...
Make DHCP IP configurable
2015-11-18 16:41:30 -08:00
e9f4bca380
Revert " #5186 : Warning: Authentication failure. Retrying... after packaging box"
2015-11-18 16:35:35 -08:00
48df85008c
Rebase and cleanup conditional
2015-11-18 16:31:44 -08:00
2c6ef938c7
Fix failing network test
2015-11-18 16:29:46 -08:00
004fe0e7bb
Make DHCP IP configurable
...
This makes it possible to have DHCP attribute IPs to guests under
various subnets
2015-11-18 16:29:46 -08:00
ecf6087a90
Merge pull request #6537 from mitchellh/sethvargo/emit_upstart
...
Fix upstart detection and event emit
2015-11-18 16:26:06 -08:00
42d0c3637c
Merge pull request #6406 from markus-perl/5186
...
#5186 : Warning: Authentication failure. Retrying... after packaging box
2015-11-18 16:23:44 -08:00
82f620ed13
Fix upstart detection and event emit
2015-11-18 16:18:32 -08:00
f95b7914f7
Merge pull request #6515 from oliviermeurice/slack_net_conf
...
Slack net conf
2015-11-18 16:04:17 -08:00
1f6e5aa081
Check if the network manager is before reloading
2015-11-18 15:55:11 -08:00
c743d88ad6
Fix bad options
2015-11-18 15:26:45 -08:00
d425193e42
Merge pull request #6493 from Ingramz/master
...
Re-enable UNC paths for shared folders on Windows hosts
2015-11-18 15:20:21 -08:00
c43e0af4d7
Merge pull request #6382 from sophicware/fix/salt-provisioner-install-args
...
[salt] [bugfix] Restablize Salt provisioner
2015-11-18 15:19:02 -08:00
394f66468d
Merge pull request #6489 from invernizzi/master
...
Update docker installer to work on custom kernels
2015-11-18 15:16:32 -08:00
c754c0bf34
Merge pull request #6488 from dvorak/rescue-enetunreach
...
Add Errno::ENETUNREACH to SSH rescue
2015-11-18 15:13:59 -08:00
9e1a119a4b
Merge pull request #6475 from nikelmwann/linux-host-use-xfreerdp
...
Prefer xfreerdp for RDP connections on Linux hosts.
2015-11-18 15:12:47 -08:00
fbdb6c0d19
Merge pull request #6474 from aneeshusa/enable-salt-options-for-masterless
...
Enable log_level and colorize for salt masterless
2015-11-18 15:11:54 -08:00
d657804f18
Merge branch 'master' of https://github.com/matthewcodes/vagrant into matthewcodes-master
2015-11-18 15:09:47 -08:00
f5f596ab8b
Merge pull request #6389 from grafjo/fix_6151
...
Fix for #6151 / provisioner puppet_server with Puppet Collection 1
2015-11-18 14:59:58 -08:00
d69d7047b2
Merge pull request #6386 from legal90/fix-osx-nic-order
...
Fix network configuration in OS X (Darwin) guests
2015-11-18 14:33:51 -08:00
d89bd56d27
Merge pull request #6373 from caleblloyd/patch-1
...
Hyper-V: select boot device by VM generation
2015-11-18 14:16:54 -08:00
72d62e3d2e
Merge pull request #6404 from timotei/patch-1
...
Remove back tick in puppet facts definitions #6403 (Fix vagrant 1.7.3+ with puppet)
2015-11-18 14:02:48 -08:00
fe36131549
Merge pull request #6367 from knixeur/fix-host-slackware
...
Fix Slackware Host detection and nfsd checks
2015-11-18 14:02:06 -08:00
d680811d01
Merge pull request #6364 from ctammes/patch-1
...
Update push.rb
2015-11-18 14:01:16 -08:00
774940521e
Ignore Powershell progress updates on stderr
...
Starting with PowerShell 5, the progress bar can be observed via the
Write-Progress cmdlet. From WinRM, this appears as a stderr output.
Vagrant assumes that there is error if output appears on stderr.
This terminates various scripts which previously executed successfully
in Vagrant (prior to Windows 10).
This fix injects a variable assignment at various points of the script
execution process to disable display of the progress bar.
2015-11-18 13:52:25 -08:00
90b850aa49
Merge pull request #6307 from tbriggs-curse/fix/master/6306_chef_windows_capability
...
Fix/master/6306 chef windows capability
2015-11-18 13:48:48 -08:00
a31f505731
Merge pull request #6288 from rickard-von-essen/dnf
...
Use dnf on Fedora guests instead of yum if available.
2015-11-18 13:37:22 -08:00
c200190c5b
Merge pull request #6259 from philipwigg/5943-fix-puppet-verify-binary
...
Fix verify_binary for Puppet for Windows guests.
2015-11-18 13:15:34 -08:00
f8b243a810
Merge pull request #6254 from krig/suse-nfs-commands
...
Updated NFS commands for SUSE, add sudoers script for SUSE, fix sudoers scripts for Linux
2015-11-18 13:14:52 -08:00
fbe10cf7f6
Merge pull request #6232 from mirthy/windows7-hostinfo
...
FIX: Use a .NET API call instead of a Win8+ cmdlet
2015-11-18 13:11:10 -08:00
b34db6a433
Merge pull request #6219 from jgoldschrafe/f-better-ubuntu-systemd-detection
...
Better Ubuntu systemd detection
2015-11-18 13:10:09 -08:00
d3bcc4e5f9
Merge pull request #6213 from jrob/winrm-execution-timeout
...
Winrm execution timeout
2015-11-18 13:00:59 -08:00
b7a610a808
Merge pull request #6203 from dustymabe/master
...
Fix Fedora /etc/hosts bug
2015-11-18 12:55:23 -08:00
10c53dfb4b
update CHANGELOG
2015-11-18 12:54:42 -08:00
34dc9e237e
Merge pull request #6195 from ArloL/fix-windows-xp-shell-provisioning
...
Check if Schedule.Service com object is available
2015-11-18 12:52:24 -08:00
e6098f6c4f
rename to powershell_elevated_interactive
2015-11-18 12:51:18 -08:00
dde21bc95a
fix file permissions
2015-11-18 12:48:41 -08:00
37940e7350
Merge pull request #6185 from marc-ta/elevated_interactive
...
Elevated interactive
2015-11-18 12:46:39 -08:00
7345c67b98
Merge pull request #6160 from lonniev/lonniev_rsync_issue_6115_branch
...
Scrub Guest Paths for Windows Rsync leaving Dirty Paths for Winrm Mkdir
2015-11-18 12:10:09 -08:00
4ccf83de44
Merge pull request #6172 from glensc/pld/networking
...
fix network detection on pld-linux
2015-11-18 12:08:53 -08:00
8886a20d34
Merge pull request #6150 from pwnall/patch-2
...
Don't warn about an .1 IP for DHCP networks
2015-11-18 12:04:52 -08:00
aa0f57f7b7
Merge branch 'master' of https://github.com/apertoso/vagrant into apertoso-master
2015-11-18 12:00:12 -08:00
fedc7e21b3
provisioners/salt: deprecate config_dir
2015-11-18 11:56:07 -08:00
6c250d023e
Merge pull request #6073 from johntron/revert-74d22069
...
Stop trying to upload minion config to privileged directory
2015-11-18 11:52:06 -08:00
ab1c0a889c
Merge pull request #6050 from benh57/fix_environment_error
...
Fix string parse error in the environment path missing error message.
2015-11-18 11:40:41 -08:00
6639d56c9c
Merge pull request #5999 from PatOShea/patch-4
...
Correct salt-minion and call ext on windows guest
2015-11-18 11:39:09 -08:00
7f25d49e81
Merge pull request #5991 from Mattias-/fix-puppet-environment-manifest
...
Fix puppet apply environment default manifest
2015-11-18 11:31:54 -08:00
3d6b11375a
commands/plugin: plugin-clean-sources
2015-11-18 11:21:39 -08:00
946d2fe154
Merge pull request #4738 from robkinyon/skip_default_sources
...
Added a --plugin-clean-sources parameter
2015-11-18 11:20:34 -08:00
d0ad747914
Merge pull request #5986 from denisbr/master
...
Specify time and don't do -h -H which is not really a valid usage.
2015-11-18 11:02:43 -08:00
b69d635f75
commands/up: use sets
2015-11-18 10:59:29 -08:00
fdd3b5c7ec
Merge pull request #5981 from jkburges/named_provision_with
...
Allow provisioner instance names to be specified for `up` and `reload…
2015-11-18 10:54:22 -08:00
176b38880d
Merge pull request #6534 from mitchellh/sethvargo/less_access_token
...
Only append access_token the first time
2015-11-18 10:53:34 -08:00
6bc286a70b
website: update docs for powershell
2015-11-18 10:51:18 -08:00
e34af86acf
commands/powershell
2015-11-18 10:46:17 -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
8bbf6f56f4
Merge pull request #4400 from mwrock/ps-cmd
...
Add a ps command to vagrant that drops the user into a remote powershell shell
2015-11-18 10:41:36 -08:00
819c9b6425
provisioners/ansible_local: align console outputs
...
Use "info" level for main tasks (installing ansible, running galaxy,
running playbook).
Use "detail" level for subsequent details.
2015-11-18 09:37:27 +01:00
c1f3d114f5
provisioners/ansible(both): add galaxy support
...
Close #2718
2015-11-17 22:08:29 +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
80021ceafb
Add network configuration plugin for Slackware Linux
2015-11-12 14:33:04 +01:00
75cc6ef8d3
provisioners/ansible_local: fix a str-to-sym bug
...
Without this change `ansible.version = "latest"` is not considered as
equivalent to `ansible.version = :latest`.
2015-11-12 09:14:35 +01:00
c6ef73a6fa
Merge 'gildegoma/2103-ansible-local-v2'
...
Resolve conflict in CHANGELOG.md
2015-11-10 23:05:29 +01:00
3f4a372d57
Remove all available versions of a box
...
This patch introduces a new parameter --all for the remove
command of the box plugin. Setting this parameter will remove
all available versions of a specific box.
Example usage:
```
$ vagrant box list
ubuntu/trusty64 (virtualbox, 20150427.0.0)
ubuntu/trusty64 (virtualbox, 20150430.0.0)
ubuntu/trusty64 (virtualbox, 20150506.0.0)
```
```
$ vagrant box remove ubuntu/trusty64
You requested to remove the box 'ubuntu/trusty64' with provider
'virtualbox'. This box has multiple versions. You must
explicitly specify which version you want to remove with
the `--box-version` flag. The available versions for this
box are:
* 20150427.0.0
* 20150430.0.0
* 20150506.0.0
```
With the --all parameter it is possible to remove all versions at once.
```
$ vagrant box remove --all ubuntu/trusty64
Removing box 'ubuntu/trusty64' (v20150506.0.0) with provider 'virtualbox'...
Removing box 'ubuntu/trusty64' (v20150430.0.0) with provider 'virtualbox'...
Removing box 'ubuntu/trusty64' (v20150427.0.0) with provider 'virtualbox'...
```
2015-11-09 09:32:18 +00:00
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
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
baea923e9c
commands/up: automatically install providers
2015-11-05 13:58:15 -08:00
df32f6ac51
Update docker installer to work on custom kernels
...
The current docker installer attempt to install the linux-image-extra-`uname -r` DEB package on Debian systems.
This package may not exist, for example on custom kernels (e.g., Linode servers).
If this happens, Vagrant halts the provisioning. However, this package is not really needed in newer Debian releases (such as Ubuntu 14.04).
This small patch checks if the linux-image-extra-`uname -r` package exists, and it will install it if it does. In either case, it will continue provisioning.
2015-11-05 13:56:13 -08:00
d863242538
Add Errno::ENETUNREACH to SSH rescue
...
This changes the ssh ready? method to treat ENETUNREACH the same way as
EHOSTUNREACH errors.
When attempting to SSH into a box, it tries up to 5 times to connect to
the box, ignoring various errors. Later it will catch and gracefully
handle most of those errors so that callers don't have to know the
details.
However, the Errno::ENETUNREACH error is not caught, which means that
callers that expect a clean boolean return from ready? don't get that,
and instead get an exception they probably aren't expecting.
2015-11-05 15:40:27 -05:00
4a7aa83e58
Use UNC paths for shared folders on Windows host
2015-11-05 18:56:24 +02:00
ea66e22d2e
Use UNC paths for shared folders on Windows host
2015-11-05 18:55:34 +02:00
abb1030f10
hosts/windows: install VirtualBox
2015-11-04 19:37:55 -08:00
dad5962ebb
hosts/darwin: support virtualbox install
2015-11-04 15:47:56 -08:00
72e13ee9ef
test: add tests for provider command
2015-11-04 14:26:22 -08:00
d4ddb3c2f3
commands/provider
2015-11-04 14:20:48 -08:00
e687f81fce
Re-word Linux RDP error to include `xfreerdp`.
...
Changed the name of the error LinuxRDesktopNotFound to
LinuxRDPClientNotFound and re-worded error text in
templates/locales/en.yml to include `xfreerdp` when listing supported
RDP clients.
2015-11-02 23:42:01 -08:00
879977832c
Prefer xfreerdp for RDP connections on Linux hosts.
...
Rather than only using rdesktop (which does not work properly with newer
versions of RDP), use xfreerdp if available and fall back to rdesktop if
not.
2015-11-02 23:39:06 -08:00
84408c1682
Enable log_level and colorize for salt masterless
2015-11-02 20:57:29 -05:00
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
8e7a297fb5
Fix for interpolated strings being used for username and passwords, this fix was made in commit 1dd081d but was removed by 1152b4e. This was causing passwords with $ in them to stop working as the dollar sign was getting stripped out
2015-10-28 16:39:19 +00:00
61466c8e65
#5186 : Warning: Authentication failure. Retrying... after packaging box
2015-10-17 23:00:39 +02:00
efa01abb12
providers/virtualbox: if no box, don't import the master
2015-10-16 10:30:04 -07:00
Seth Vargo
Mitchell Hashimoto
Mitchell Hashimoto
Seth Miller
Tristan Rivoallan
Seng Lin Shee
Gilles Cornu
Olivier Meurice
Christian Berendt
Luca Invernizzi
Clayton O'Neill
Indrek Ardel
Eric Winkelmann
Aneesh Agrawal
matthewcodes
Markus Perl