dd7294b021
Merge pull request #7928 from chrisroberts/rsync/exclude-paths
...
synced_folders/rsync: Quote exclude paths
2016-10-26 07:16:15 -07:00
eb7568b2ed
Merge pull request #7922 from chrisroberts/netbsd/rsync
...
guests/netbsd: Use full path to pkg_add command
2016-10-25 18:51:42 -07:00
be3fa85853
Merge pull request #7921 from chrisroberts/fix/key-fixups
...
Remove `set -e` usage for better shell compatibility
2016-10-25 14:43:04 -07:00
365b98fee6
Merge pull request #7926 from chrisroberts/networking/rhel
...
guests/redhat: Force NetworkManager to reload device configurations
2016-10-25 14:41:07 -07:00
fc6824e79c
guests/netbsd: Include /usr/sbin in PATH for pkg_add command
2016-10-25 14:22:38 -07:00
05c5aab92a
synced_folders/rsync: Escape exclude paths
2016-10-25 13:59:03 -07:00
c39b3fbb76
guests/openbsd: Check package installation after installing package
...
The `pkg_add` command will return `0` when a package requested for
installation is not found. This adds a validation check to ensure
the rsync package is actually installed on the guest.
2016-10-25 12:16:52 -07:00
67f3c8b48c
guests/redhat: Force NetworkManager to reload device configurations
...
When configuring network devices force NetworkManager to reload new
configuration files as they appear. This prevents NetworkManager from
attempting to continue managing devices on initial start up.
2016-10-25 07:45:38 -07:00
fb4e4320b2
Remove `set -e` usage for better shell compatibility
2016-10-24 10:30:08 -07:00
3ee2bca793
Merge pull request #7907 from chrisroberts/salt-config/defaults
...
provisioners/salt: Synchronize config defaults with documentation
2016-10-24 07:07:41 -07:00
b9174895a5
provisioners/ansible (minor): Fix alphabetical order of base attributes
...
This point was missed in #6627 .
2016-10-23 20:46:30 +02:00
a842abbc38
provisioners/ansible(both): Add config_file option
...
With this new option defined, the `ansible-galaxy` and
`ansible-playbook` commands generated by the Ansible provisioners will
be executed with the ANSIBLE_CONFIG environment variable set
accordingly.
Resolve GH-7195
This commit also fix the following open issues:
- Implement the pending RSpec examples about path existence checks
performed by the ansible (remote) provisioner.
- In verbose mode, the ansible remote provisioner now correctly displays
the Ansible Galaxy parameters ("role_file" and "roles_path") with
single quotes (which is safer for potential copy-paste usage).
Additional Notes:
- Test coverage for `ansible_local` provisioner is still not
implemented. See GH-6633.
- Test coverage for galaxy from host is not implemented yet (due to
general issue with mocking both command executions, see
https://github.com/mitchellh/vagrant/pull/6529#r45278451
2016-10-22 01:09:12 +02:00
d56cf55a89
provisioners/ansible_local: Use quotes for path checking
...
Without this fix, the ansible_local provisioner fails to check the
existence of a filesystem path that contains a blank/space character.
2016-10-21 16:44:18 +02:00
432f79339c
provisioners/ansible(base): Add parenthesis for better readability
...
Make more evident on what the "if modifiers" (aka trailing conditionals) apply.
2016-10-21 16:43:37 +02:00
37a525fbbc
Little bit of cleanup.
2016-10-20 22:43:00 +02:00
e6093dd709
The virtual machine doesnt need 'Virtual Machines' in its path, this is created when importing.
2016-10-19 21:03:48 +02:00
c075c026be
Keyboard language setting made my comment bad
2016-10-19 20:56:52 +02:00
055bed5918
removed an extra echo and added proper error message when there is incompatibilities. Appearantly importing into a compressed folder wont work and will result in an error.
2016-10-19 20:55:56 +02:00
fa2a9105f0
provisioners/salt: Synchronize config defaults with documentation
2016-10-17 10:11:39 -07:00
418064519d
Move dynamic memory settings into conditional block
2016-10-14 18:53:44 -07:00
803fff7f03
Fix issue with missing slash in paths
...
It was failing to create files below the machines\default\hyperv folder, rather it was creating folders named 'hypervSnapshots', 'hypervVirtual Hard Disks', and 'hypervVirtual Machines'. This was causing the files to not be removed when destroying the vm, and an error when subsequently bringing it up again.
2016-10-11 15:31:28 -05:00
b9ea9a2ac2
Merge pull request #7887 from chrisroberts/guests/linux-detection
...
Guests/linux detection
2016-10-11 12:55:52 -07:00
9d61d7c61b
Merge pull request #7818 from rswarts/vz7flavor
...
Add Virtuozzo Linux 7 to list of RHEL flavors
2016-10-11 10:35:20 -07:00
d0549d6e11
guests/linux: Provide common linux detection style
...
Defines a common and generic linux detection strategy which can be
subclassed and easily reused by providing a custom detection constant.
2016-10-11 07:50:34 -07:00
6050b13f43
Make Debian guest detection more reliable
...
/etc/issue is far from being a reliable source for OS detection as it
can be changed by a user without affecting any OS functionality. As
newer Debian systems run systemd by default, check for /etc/os-release
and fallback to lsb_release for older Debian versions. Check #7625 for
a similar issue. Even lsb_release is not manatory, therefore keep the
current code of parsing /etc/issue to avoid regressions.
2016-10-11 07:49:35 -07:00
a55590b84f
provisioners/ansible_local: Change binary detection
...
- Remove `ansible-galaxy` detection, since this command was introduced
in Ansible 1.4.2 (December 2013). Checking for `ansible-playbook`
presence should therefore be enough for any "modern" Ansible setup.
- Look for the command defined by the new `playbook_command` option.
Related to GH-7881 and GH-7536
2016-10-10 23:24:19 +02:00
b1ddc98e17
Merge pull request #7881 (Add playbook_command option)
...
Note that error messages were not adapted, and only mention
a generic "Ansible Software" when executed commands are failing.
We assume that people using the `playbook_command` option are
advanced users that will know all the components to be considered.
2016-10-10 23:18:24 +02:00
26e8bdc1f1
Merge pull request #7536
2016-10-10 23:03:00 +02:00
07ce1c6930
Merge pull request #7866 from chrisroberts/guest-linux/network-interfaces-sorting
...
guests/linux: Update network interface sorting implementation
2016-10-10 10:59:52 -07:00
7eb1091a71
Merge pull request #7874 from chrisroberts/enhancement/cast-box-version
...
config/vm: cast box version to string before string operations
2016-10-10 10:57:53 -07:00
a8970281ce
guests/linux: Properly sort interface name types
...
Add failing networking interface list sorting test with example
provided by #7883 . Update sorting logic to properly handle different
types and differing array lengths.
Fixes #7883
2016-10-10 10:22:19 -07:00
42efd5c198
Make the Virtual Hard Disks directory if importing from XML to keep it consistant across config types
2016-10-09 21:10:56 +02:00
58f2b0c8c7
Make ansible-playbook command configurable
...
The ansible-playbook command is currently hardcoded for the ansible and
ansible_local provisioners. This patch adds the config option
playbook_command to allow the user to change the command.
2016-10-09 20:48:50 +02:00
8744caebcf
Small typo in options
2016-10-09 20:39:17 +02:00
7b03bf335b
Whitespace
2016-10-08 16:44:24 +02:00
debe50957b
Refactor the import script to fully use Compare-VM for creating the new VM.
...
Implemented the differencing disk for vmcx.
This means the disk is now copied by Hyper-V (Powershell) instead of Ruby for new machines.
This does mean EFI Firmware now does work for machines since it is quite a feep copy. Compare-VM will report incompatibilities should they be found.
2016-10-08 16:38:42 +02:00
d178631ff9
Generic white space strip from command strings
2016-10-07 17:30:27 -07:00
703513bd0f
Revert "Fix incorrect ssh-config output when '--host' is defined"
...
This reverts commit c77326438b
2016-10-07 16:50:12 -07:00
bb60fdd790
Merge pull request #7877 from guessi/fix_7728_incorrect-ssh-config-output
...
Fix incorrect ssh-config output when '--host' is defined
2016-10-07 15:19:18 -07:00
33b13dffbe
Merge pull request #7873 from markpeek/markpeek-photon-netmask
...
Fix typo (netmast => netmask) for Photon guest #7808
2016-10-07 15:15:26 -07:00
4bf32e3f6d
Fix typo (netmast => netmask) for Photon guest #7808
2016-10-07 12:32:21 -07:00
a77da314e5
Only check for .vmcx if there is no XML found to not risk breaking older vagrant boxes that added an XML file manually
2016-10-07 20:38:05 +02:00
c77326438b
Fix incorrect ssh-config output when '--host' is defined
...
Fixes : #7728
Signed-off-by: guessi <guessi@gmail.com>
2016-10-07 23:47:56 +08:00
6ed612e93b
Move package_setup_files to general lib to minimize code duplication
2016-10-07 17:31:15 +02:00
26b3a303d2
config/vm: cast box version to string before string operations
2016-10-06 16:16:59 -07:00
8291c56fd2
Merge pull request #7688 from hunterboerner/7597-docker-interactive-flag
...
Remove --interactive flag from Docker command
2016-10-06 15:41:58 -07:00
b738aaac0f
Merge pull request #7813 from rudineirk/fix-non-upstart-linux
...
Fix non upstart linux nfs mounts
2016-10-06 12:59:23 -07:00
a4d41d0a0e
Move code for set-folders for packing VirtualBox to general
2016-10-06 15:07:13 +02:00
5877e8fe22
Sart refactor duplicate classes
2016-10-06 08:55:59 +02:00
8619267cd9
Fix getting mac address from the driver.
2016-10-06 08:29:05 +02:00
5d0de9486e
Remove some logging from the package action.
2016-10-06 08:28:52 +02:00
391c5be08e
Remove --interactive flag from Docker command
...
See: GH-7597. Due to the childprocess gem setting STDIN to a pipe,
Docker will fail as it requires STDIN to be a TTY if run with
--interactive.
2016-10-05 14:38:20 -05:00
0970a5a67b
Generate metadata.json in root of package.
2016-10-05 14:42:46 +02:00
be2e9e79aa
FIrst draft of packaging of Hyper-V boxes. Need to refactor the package_* files since right now they are copies of the virtualbox versions, might just put them in general.
2016-10-05 13:48:48 +02:00
a384276431
Merge pull request #7751 from wakeful/fix-centos7-do-not-prompt-before-overwriting
...
Fix CentOS7 network config - do not prompt before overwriting
2016-10-04 17:31:42 -07:00
e2b18fc65d
guests/linux: Update network interface sorting implementation
...
Always pull ordered ethernet devices to the head of the list. Ensure
aliases are not included.
2016-10-04 17:25:00 -07:00
133e2a7b0f
Broke Path argument in mini refactor.
2016-10-04 20:06:10 +02:00
2fc93277fd
change argument to vm_config_file so it isn't the same as variable in powershell script.
2016-10-02 18:45:51 +02:00
1ec1cf8177
Update Hyper-V import command and the driver to check for configuration type and call the correct import script.
2016-10-02 16:10:58 +02:00
b041c1955c
Add support for vmcx files, new binary format for Hyper-V configurations.
2016-10-02 16:10:16 +02:00
f72cd286c1
Merge pull request #7831 from mwrock/nano
...
Use the cmd shell to check winrm availability to fix `vagrant up --no-provision` on nano
2016-09-30 16:16:42 -07:00
2e6b23c8fd
Merge pull request #7848 from chrisroberts/fix/eth-first-predictable
...
guests/linux: Place ethernet devices at start of device list
2016-09-30 14:50:08 -07:00
0300df09fb
guests/linux: Update constant name, freeze constant values
2016-09-30 12:11:54 -07:00
6e6b35f1c5
Merge pull request #7712 from mwrock/executor
...
fix #7489 preventing winrm connection leakage
2016-09-30 09:10:42 -07:00
9f468d2626
guests/linux: Place ethernet devices at start of device list
2016-09-29 15:33:29 -07:00
c5e1a6d8c0
use the cmd shell to check winrm availability
2016-09-26 14:07:11 -07:00
2ecbc241c3
Add Virtuozzo Linux 7 to list of RHEL flavors
2016-09-23 10:45:16 +02:00
e8cf9bb168
provisioners/ansible: review pull request #7752
...
- Honour `ssh.proxy_command` setting (even when the Docker provider is
used via a proxy host). Silly configurations may lead to silly
behaviors, but let's apply the settings...
- Remove condition on `provider_config.connect_via_ssh`, which is
a provider specific parameter (from vagrant-libvirt provider).
- Add a simple unit test
2016-09-21 23:40:20 +02:00
a1d78edaf8
changes after review
2016-09-21 23:40:15 +02:00
a943f67da1
support ansible for remote servers and vm
2016-09-21 23:39:43 +02:00
8b8c961935
Fix non upstart linux nfs mounts
2016-09-20 17:57:54 -03:00
2e723ea308
added general restart for network - to prevent IP address dropping on interfaces
2016-08-23 21:02:11 +01:00
1c4e7ee068
assuming a scenario - vagrant up -> power off -> vagrant up
...
vagrant will stuck on the network configuration
DEBUG ssh: stdout: mv: overwrite '/etc/sysconfig/network-scripts/ifcfg-eth0'?
DEBUG ssh: Sending SSH keep-alive...
2016-08-23 20:58:15 +01:00
c59723e595
Merge pull request #7740 from chrisroberts/nfs/v4
...
Add NFSv4 warning and information
2016-08-19 10:19:34 -07:00
a7537a6be0
Merge pull request #7726 from chrisroberts/fix/rsync-exclude
...
Ignore files excluded from sync on chown
2016-08-19 09:58:31 -07:00
5e44e308a5
Merge pull request #7725 from chrisroberts/fix/package-machine-dir
...
Machine data directory for base box package
2016-08-19 09:48:38 -07:00
bbac718925
Add NFSv4 warning and information
2016-08-19 09:33:36 -07:00
dd6ad2fbf3
guests/linux: only use effective group ID when appropriate
2016-08-17 06:53:26 -07:00
f577ca3d23
commands/package: provide machine data directory for base box
2016-08-17 06:49:12 -07:00
185a7dfc2e
guests/rsync do not chown files excluded from sync
2016-08-16 15:13:19 -07:00
64828f1ed3
fix #7489 preventing winrm connection leakage
2016-08-13 07:49:08 -07:00
dd91269491
guests: Prevent ssh disconnect from causing error on halt
2016-08-12 13:25:39 -07:00
ce3329e184
guests/linux: Always order discovered network interfaces
2016-08-12 10:31:41 -07:00
155c78ea93
communicators/ssh: Filter command stdout output
2016-08-11 13:26:56 -07:00
9e26e31a6b
Add generated private key options to rsync command
2016-08-11 13:00:37 -07:00
ee185f4b9e
Set private_key_path and log_level within hash construction
2016-08-11 12:13:11 -07:00
7ba4f2087b
Include LogLevel option within ssh command setup
2016-08-11 12:12:45 -07:00
cb70749bd8
redux of pr 7398 for ssh-agent key fix
2016-08-11 11:48:10 -07:00
6cdab917de
guests/dragonflybsd: add detection for DragonFly BSD
2016-08-10 09:14:08 -07:00
571659a5d1
guests/openbsd: include -h option on shutdown
...
For OpenBSD versions prior to 5.7 the `-h` option _must_ be provided
to the `shutdown` command when `-p` is used. Later versions no longer
require the `-h` option but still allow it for compatibility.
http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/sbin/shutdown/shutdown.8?rev=1.40&content-type=text/x-cvsweb-markup
http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/sbin/shutdown/shutdown.c?rev=1.40&content-type=text/x-cvsweb-markup
2016-08-10 09:14:08 -07:00
666d5e6391
guests/bsd: remove darwin matching
2016-08-10 09:10:56 -07:00
4144b45122
Fix RDP connections on OS X
...
Changes introduced in 982af05
2016-08-09 14:04:50 -07:00
d350fd0d28
Resolve whitespace
2016-07-26 13:56:20 +01:00
344fc0ea7b
Implement auto_start_action and auto_stop_action
2016-07-26 13:41:01 +01:00
820607bbf6
Fix `authorized_keys` permissions for BSDs
...
This is an extension of a6760dd8e7#7610
2016-07-25 18:25:58 -03:00
a732b355d2
Merge pull request #7632 from mitchellh/sethvargo/ubuntu_detect
...
guests/ubuntu: Revert detection
2016-07-23 15:18:53 -04:00
00fa49191d
guests/ubuntu: Revert detection
...
- Semi-reverts GH-7524
- Fixes GH-7625
2016-07-23 15:02:11 -04:00
73cc633b02
Detect NFS server by service name on Arch
...
Fixes #7629 .
nfs-server.service seems to load kernel modules it needs itself, while nfsd appears in `/proc/filesystems` only after the kernel module has been loaded, so vagrant fails to detect NFS server until it's started first time after the system has booted. This checks if the NFS service actually exists and hopes that it'll figure the stuff out itself.
`list-unit-files` is utilized rather than `list-units` because systemd seems to not list units that are disabled: https://lists.fedoraproject.org/pipermail/devel/2011-November/159117.html
2016-07-23 13:09:23 +03:00
855643e9a5
s/bsd/linux/
2016-07-19 11:45:03 -06:00
a6760dd8e7
fixes #7610
2016-07-19 11:22:35 -06:00
Chris Roberts
Chris Roberts
Gilles Cornu
Bjorn Brala
Brian Retford
Jake Ballard
Reto Gantenbein
Daniel Gonzalez
Mark Peek
guessi
Theron Boerner
Matt Wrock
Rutger Swarts
Dmitry Vasilets
Rudinei Goi Roecker
AJ
Zack Train
Charlie Sharpsteen
tfanning
Jose Luis Duran
Seth Vargo
Alexander Kurilo
hendrenj