Mitchell Hashimoto
0b2d60ac39
commands/cap: better help
2015-10-08 10:36:44 -04:00
Mitchell Hashimoto
99d29f17fa
commands/cap
2015-10-08 10:35:36 -04:00
Mitchell Hashimoto
6e187aaefb
providers/virtualbox: v4.2 and 4.3 support
2015-10-08 08:57:21 -04:00
Mitchell Hashimoto
0abc17eaed
commands/snapshot: push now uses caps to be more resilient
2015-10-08 08:55:13 -04:00
Mitchell Hashimoto
7480b65e9d
providers/virtualbox: use caps for snapshot list
2015-10-08 08:46:36 -04:00
Mitchell Hashimoto
ed4df21c85
commands/snapshot: push and pop
2015-10-07 22:52:27 -04:00
Mitchell Hashimoto
c36b682e40
providers/virtualbox: fix error if no snapshots
2015-10-07 22:22:55 -04:00
caleblloyd
00894b5a27
hyper-v boot device by generation fixes #6372
2015-10-07 20:25:09 -04:00
Mitchell Hashimoto
8c0e38b397
providers/virtualbox: snapshot restore
2015-10-07 16:48:29 -04:00
Mitchell Hashimoto
c635352b89
providers/virtualbox: list snapshots, progress for delete
2015-10-07 16:41:58 -04:00
Mitchell Hashimoto
d0e8ecfc73
providers/virtualbox: snapshot save/delete
2015-10-07 16:16:53 -04:00
Mitchell Hashimoto
a99ebcb3ce
commands/snapshot
2015-10-07 15:52:37 -04:00
Guillermo Bonvehí
07e38f1bb3
Fix Slackware Host detection and nfsd checks
...
Slackware's version file is /etc/slackware-version not
/etc/slackware-release.
pidof is not on PATH by default (not running as root) so call it using
full path
2015-10-07 01:17:07 -03:00
Mitchell Hashimoto
0586412f9d
providers/virtualbox: fix some crashing bugs
2015-10-06 16:22:48 -04:00
Mitchell Hashimoto
2c936b2e37
providers/virtualbox: tidying up the linked clone feature
2015-10-06 14:11:41 -04:00
Mitchell Hashimoto
d519d927fa
Merge branch 'VB-linked-clone-support' of https://github.com/mpoeter/vagrant into mpoeter-VB-linked-clone-support
2015-10-06 13:50:34 -04:00
ctammes
0556b3b040
Update push.rb
...
https://github.com/mitchellh/vagrant/issues/5570
When uploading from Windows to Linux, the Windows filepath was added to the Linux path.
2015-10-06 14:02:45 +02:00
Mitchell Hashimoto
2299715b41
providers/virtualbox: code review comments
2015-10-01 17:01:27 -04:00
Mitchell Hashimoto
05fbb4ced2
providers/virtualbox: more support
2015-10-01 08:50:47 -04:00
Mitchell Hashimoto
061a91d09b
providers/virtualbox: workaround IPv6 routing bug in VB
...
VirtualBox has a bug where the IPv6 route is lost on every other
configuration of a host-only network. This is also triggered when a VM
is booted.
To fix this, we test the route-ability of all IPv6 networks, and
reconfigure if necessary. This is very fast but we still only do this if
we have any IPv6 networks.
2015-09-30 18:19:37 -07:00
Mitchell Hashimoto
0d50f454ea
providers/virtualbox: VB5 support
2015-09-30 17:29:23 -07:00
Mitchell Hashimoto
ec0b0fb7f9
providers/virtualbox: IPv6 host only networks
2015-09-30 17:23:25 -07:00
Maarten De Wispelaere
cfd4270cdb
FIX bug introduced in #6315
2015-09-28 09:08:20 +02:00
Brian Dwyer
fd593a85b7
Add `nodes_path` support for the Chef-Solo provisioner
2015-09-27 23:23:28 -04:00
Maarten De Wispelaere
e0dad41b0c
FIX: no exception for debian 8 needed, shutdown -h -H doesn't work ; use normal shutdown -h now
2015-09-24 12:18:59 +02:00
Trey Briggs
a5b6e23e20
Removed extra quote in powershell command.
2015-09-22 23:28:14 -05:00
Trey Briggs
ed1c219a07
version is a Symbol, convert to String before concat.
2015-09-22 23:26:02 -05:00
tomfanning
41beaac074
Hyper-V set mac address
2015-09-22 11:35:55 +01:00
Rickard von Essen
acde6e1b16
Use dnf on Fedora guests instead of yum if available.
...
Fixes #6286 now properly installs Docker on Fedora guests.
Fixes #6287 use dnf if available.
2015-09-20 09:30:49 +02:00
Sam Phippen
53714abfa3
Handle encoding errors in shell provisioner newline normalization.
...
The problem demonstrated in #6065 is that a string has incorrectly been
encoded with US-ASCII even though it contains invalid US-ASCII byte
sequences (any byte with the most significant bit on is invalid in the
US-ASCII encoding).
The thing about doing newline normalization is that it is not actually
sensitive to the presence of US-ASCII byte sequenzes. Additionally, it
is very unlikely that a user will ever be using an encoding where \r\n
is not encoded the same as it would be in ASCII.
This patch first tries the existing method of normalizing the newlines
in the provided script file, if that fails for any reason it force
encodes the string to ASCII-8BIT (which allows the most significant bit
to be on in any individual byte) and then performs the substitution in
that byte space.
2015-09-12 14:36:54 +01:00
Philip Wigg
33b4d6a63d
Fix verify_binary for Puppet for Windows guests.
2015-09-11 20:06:21 +01:00
Kristoffer Grönlund
1911586832
Better NFS status check command for SUSE
2015-09-10 10:05:14 +02:00
Jeff Kwan
4b32744424
Use a .NET API call instead of a Win8+ cmdlet
...
The root cause is that Windows 7 doesn't have Get-NetIPAddress (
see:
https://stackoverflow.com/questions/19529442/gather-ip-address-information
)
but the change was to try and solve the bug that the VPN IP
addresses
aren't visible detailed
here:
https://support.microsoft.com/en-us/kb/2549091
Resolved using the
2nd solution
from
http://serverfault.com/questions/145259/powershell-win32-networkadapterconfiguration-not-seeing-ppp-adapter
2015-09-03 16:54:41 -04:00
Paul Hinze
1e84cc4d6a
communicators/winrm: respect boot_timeout when fetching winrm_info
...
We gained a ton of improvemnts to WinRM error handling in
https://github.com/mitchellh/vagrant/pull/4943 , but we also got one bug.
The new code raises an exception when `winrm_info` does not return right
away. This was preventing us from catching the retry/timout logic that's
meant to wait until boot_timeout for the WinRM communicator to be ready.
This restores the proper behavior by rescuing the WinRMNotReady
exception and continuing to retry until the surrounding timeout fires.
2015-09-02 16:36:23 -05:00
Jeff Goldschrafe
c7186236f1
Better Ubuntu systemd detection
...
Check the running process at PID 1 to determine which init system is currently in use.
2015-08-31 17:24:13 -04:00
Jeremy Roberts
c844a9c4fd
Adding WinRM execution_time_limit to log.
2015-08-31 11:42:35 -04:00
Jeremy Roberts
18d229ca82
Added execution_time_limit for WinRM.
...
Adds a configurable value for WinRm and the elevated permission shell ExecutionTimeLimit.
Please see mitchellh/vagrant#5506
Ex: config.winrm.execution_time_limit = "P1D"
2015-08-31 11:42:25 -04:00
konomae
ad9a7324c5
Fix invalid ini entry error when ansible_ssh_private_key_file contains spaces
2015-08-29 18:00:20 +09:00
Dusty Mabe
be90f6b1da
Fix Fedora /etc/hosts bug
...
Update so that localhost entries don't get deleted when the hostname
gets added to the 127.0.0.1 line. Closes #6202
2015-08-27 16:53:21 -04:00
Arlo Louis O'Keeffe
af0f267b50
Check if Schedule.Service com object is available
2015-08-26 00:15:03 +02:00
Elan Ruusamäe
f71b27ff27
fix network detection on pld-linux
...
pld linux uses redhat as base, but lacks :flavour
this will add it
2015-08-21 12:49:36 +03:00
Lonnie VanZandt
b897fd7365
Scrub Guest Paths for Windows Rsync leaving Dirty Paths for Winrm Mkdir
...
Windows offers no out-of-the-box rsync utility. By far, the most
commonly used external utilities for Windows rsync are built with the
GNU Cygwin libraries. The cost for this convenience is that rsync on
Windows has to be provided paths that begin “/cygdrive/c” rather than
“c:/“ like other Windows-API utilities. Compounding the situation,
rsync doesn’t create paths/to/sub/targets and so the vagrant plugin
code, when performing an rsync, is responsible for creating
intermediate directories in guest paths if there are any. Furthermore,
the mkdir utility in Windows is not another Cygwin utility like rsync
but the routine mkdir of Windows command.com. Therefore, while rsync
needs the /cygwin paths, mkdir uses the Windows paths. Later, the
chef_solo.rp provisioner running within the guest will expect to find
Windows-style paths in its solo.rb configuration file. Due to all this,
vagrant has to keep track of both the original, possibly dirty Windows
guest path and the cygwin-scrubbed guest path.
2015-08-18 10:56:13 -06:00
Victor Costan
4425d91d86
Don't warn about an .1 IP for DHCP networks
...
When the network's type is :dhcp, the :ip option is used to derive the DHCP server configuration, and it doesn't actually indicate the IP that will be received by the VM(s).
2015-08-15 06:53:01 -04:00
Manuel Pöter
2a2f0a4751
Use hash of machine name for lock file to avoid problems with invalid characters for file names.
2015-08-12 14:25:54 +02:00
Mike Averto
587c88e65a
Fix Win 10 Enterprise Vagrant Error
...
This fixes error for Win 10 Enterprise:
An error occurred while executing a PowerShell script. This error
is shown below. Please read the error message and see if this is
a configuration error with your system. If it is not, then please
report a bug.
Script: get_vm_status.ps1
Error:
C:\HashiCorp\Vagrant\embedded\gems\gems\vagrant-1.7.4\plugins\providers\hyperv\scripts\get_vm_status.ps1 : Unable to
find type [Microsoft.HyperV.PowerShell.VirtualizationOperationFailedException].
At line:1 char:1
+ &('C:\HashiCorp\Vagrant\embedded\gems\gems\vagrant-1.7.4\plugins\prov ...
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ CategoryInfo : InvalidOperation: (Microsoft.Hyper...FailedException:TypeName) [get_vm_status.ps1], Ru
ntimeException
+ FullyQualifiedErrorId : TypeNotFound,get_vm_status.ps1
2015-08-09 12:44:49 -04:00
Jason Woods
ff941ef4e8
Fix broken masterless minion configuration
2015-08-03 12:11:32 +01:00
John Syrinek
ea7b277f41
Prevent fatal error caused by attempting to upload minion config to
...
privileged directory
2015-07-31 16:05:55 -05:00
Ben Hines
3f29be0de2
Fix string parse error in the environment path missing error message.
2015-07-28 11:16:20 -07:00
Brian Dwyer
e4cdb473bd
Bring back `nodes_path` support for the Chef Zero provisioner
2015-07-28 12:41:51 -04:00
지훈
287831dd2e
Fix for Issue #6006 - cfengine will now install
2015-07-20 02:08:13 -07:00
Pat O'Shea
d34bc38bf3
Updated salt-minion and call ext on windows guest
...
Salt-minion and salt-call are batch files on a windows guest, not executables.
2015-07-18 20:53:46 -06:00
Mattias Appelgren
f349a58a1e
provisioners/puppet: Fix Puppet environment default manifest
...
Also parse the puppet variables $codedir and $environment when
resolving a manifest path from environment.conf
2015-07-18 14:48:03 +02:00
Denis Brækhus
d2b0df0a7d
Specify time and don't do -h -H which is not really a valid usage.
2015-07-17 21:44:58 +02:00
Mitchell Hashimoto
4b217e2128
Merge pull request #5980 from PatOShea/PatOShea-ConfigDir-Typo
...
Fixed salt minion configuration directory typo
2015-07-17 12:37:44 -07:00
Jon Burgess
209556c3cd
Allow provisioner instance names to be specified for `up` and `reload` commands and option `--provision-with`
...
Ref: https://github.com/mitchellh/vagrant/issues/5139
2015-07-17 14:26:13 +10:00
Pat O'Shea
a4eede0c42
fixed typo for config_dir
...
Only exposed when calling highstate with config_dir being set
2015-07-16 18:45:59 -06:00
Pat O'Shea
956bbf011c
Changed minion config path for windows
...
Copy of minion is wrong on windows. Moved to sub-dir, conf.
2015-07-16 18:37:36 -06:00
Manuel Pöter
772f276ee3
Port support for linked clones to VirtualBox 5.0 driver.
2015-07-16 13:27:24 +02:00
Mitchell Hashimoto
bac5d039db
providers/docker: pull setting, default false [GH-5932]
2015-07-15 11:08:01 -07:00
Mitchell Hashimoto
f26293bb06
hosts/linux: sudo to copy back to exports [GH-5957]
2015-07-15 11:04:05 -07:00
Mitchell Hashimoto
ce5a30b264
provisioners/puppet: fix config merging [GH-5958]
2015-07-15 10:59:34 -07:00
Mitchell Hashimoto
3476491881
update CHANGELOG
2015-07-15 10:57:38 -07:00
Mitchell Hashimoto
087ffa67b2
Merge pull request #5967 from benh57/fix_puppetwin_path
...
Fix custom puppet.binary_path to work properly on windows and fix puppet detection on windows.
2015-07-15 10:56:19 -07:00
Bob
f12f50c552
Raise Errno::ETIMEDOUT as "acceptable" Errors::ConnectionTimeout
2015-07-15 19:41:10 +02:00
Ben Hines
46eedb6491
Back to using 'which' when no path is defined since the winrm communicator overrides it anyway.
2015-07-14 23:55:09 -07:00
Ben Hines
8c2ddac2cd
Check for nil config_path.
2015-07-14 23:26:55 -07:00
Ben Hines
8c1ff5ee26
Fix custom puppet.binary_path to work properly on windows.
...
Fix automatic puppet path detection on windows
2015-07-14 23:21:46 -07:00
Mitchell Hashimoto
b118ab10c8
providers/virtualbox: remove windows UNC path [GH-5933]
2015-07-13 08:38:41 -07:00
Mitchell Hashimoto
39baec78e7
Merge pull request #5936 from wkral/fix-salt-bootstrap-install
...
Fix salt bootstrap issue after 1.7.3 upgrade with verbose option set
2015-07-13 08:34:01 -07:00
Mitchell Hashimoto
a9d5d6ae4a
Merge pull request #5931 from kaorimatz/fix/guests-fedra-nmcli
...
guests/fedora: don't fail if nmcli doesn't exist on the guest
2015-07-13 08:31:01 -07:00
Mitchell Hashimoto
639f22c4d0
Merge pull request #5954 from mitchellh/sethvargo/tmpdir
...
Fallback to /tmp if $TMPDIR is not set
2015-07-13 08:30:25 -07:00
Seth Vargo
bfbf96c385
Fallback to /tmp if $TMPDIR is not set
2015-07-13 10:40:28 -04:00
Manuel Pöter
f4d1d068f9
Merge branch 'master' into VB-linked-clone-support
2015-07-13 10:56:17 +02:00
Yang Sheng Han
d09e8e6f50
guests/redhat: Fixed the NFS detection on guest, not host [GH-5948]
2015-07-13 14:18:27 +08:00
aidanhs
13e2dbaf9d
Fix setting hostname in 12.04
...
Fixes #5934
2015-07-11 19:15:54 +01:00
William Kral
27d7518636
Fix alignment of initializer
2015-07-11 10:40:17 -07:00
William Kral
ccd7354665
Initialize the install_command salt config var
2015-07-11 10:31:19 -07:00
Satoshi Matsumoto
73d5718da3
guests/fedora: don't fail if nmcli doesn't exist on the guest
2015-07-11 16:14:11 +09:00
Seth Vargo
5f383b546c
Use sudo for read_ip_address capability
...
Fixes #4868
2015-07-10 13:25:11 -06:00
Seth Vargo
516d475f16
Checksum args to each docker container in local data
...
This allows Vagrant to calculate if a container's arguments (such as the run
arguments) have changed in the Vagrantfile since the original run.
Fixes GH-3055
2015-07-10 11:32:02 -06:00
Seth Vargo
3e3037f313
Add a space before args
2015-07-10 10:49:21 -06:00
Gilles Cornu
3842a1f710
provisioners/ansible: provide ssh identities via ANSIBLE_SSH_ARGS (when necessary)
...
When provisioning multiple machines in sequence (the default vagrant
behaviour), it doesn't make sense to require to provide the private ssh
key(s) via the custom ansible inventory script/file.
To align with the handling of multiple ssh keys per machine, we won't
rely any longer on `--private-key` command line argument, but only pass
the keys via `ANSIBLE_SSH_ARGS` environment variable.
Note that when vagrant generates the ansible inventory and that only one
key is associated to a VM, this step would be redundant, and therefore
won't be applied.
This change fixes the breaking change introduced by 3d62a91.
2015-07-10 08:51:17 +02:00
Luis Pabón
f0718d620d
provisioners/ansible: Put ssh key in the inventory
...
Vagrant 1.7.1 creates and injects new ssh keys for each virtual machine.
When it started ansible with the "parallel provisioning trick",
it would only send the ssh key of the targeted virtual machine.
With this change, vagrant now stores the ssh key for each virtual
machines directly in the generated ansible inventory, and thus allow
ansible parallelism.
Note that this change is not sufficient, as it would break vagrant
configuration based on a custom inventory (file or script). This issue
will be addressed in a next commit.
Signed-off-by: Luis Pabón <lpabon@redhat.com>
2015-07-10 08:39:49 +02:00
Seth Vargo
4b1847acf3
Use Chef Client for Chef Zero
...
Fixes GH-5619
2015-07-09 21:23:42 -06:00
Seth Vargo
40b94afeb5
Update command builder now that provisioning_path has moved to runtime
2015-07-09 17:46:39 -06:00
Seth Vargo
60330218fb
Merge pull request #5913 from mitchellh/sethvargo/windows_chef_paths
...
Use windows-specific Chef paths
2015-07-09 17:05:40 -06:00
Seth Vargo
e9bcf147f0
Prefix with guest_
2015-07-09 17:01:36 -06:00
Seth Vargo
0e039159a6
Calculate Chef paths at provision time
2015-07-09 16:55:55 -06:00
Nicholas Randon
eb6aa2ac8c
Allow Ansible provisioner to run reliably in parallel
...
The Ansible Vagrant provisioner has a race where the inventory file is
updated every time the provisioner runs unless a file is provided.
Therefore if Ansible attempts to provision two nodes in parallel, you
may see the following race:
* System A writes the inventory file and calls Ansible.
* System B starts to provision and truncates the file before
creating a new one.
* Ansible on system A now attempts to read the inventory
file, which is blank. Ansible bombs out with "ERROR: provided
hosts list is empty".
To fix this, we only allow Vagrant to update the inventory file if
it needs to.
2015-07-10 00:53:59 +02:00
Seth Vargo
742d47c4cf
No longer need subprocess wrapping there :)
2015-07-09 16:06:03 -06:00
Mitchell Hashimoto
790c625bc0
Merge pull request #5884 from dcbw/dcbw/fedora-network-mac-address
...
[fedora] honor MAC address when configuring networks
2015-07-09 16:01:33 -06:00
Mitchell Hashimoto
cea44847de
Merge branch 'filter_synced_folders' of https://github.com/maxlinc/vagrant into maxlinc-filter_synced_folders
2015-07-09 15:05:52 -06:00
Mitchell Hashimoto
d51c5fbc69
Merge pull request #5435 from juiceinc/bugfix/salt-provisioner
...
Update Salt provisioner to allow more flexibility in passing arguments to the bootstrap script
2015-07-09 15:02:34 -06:00
Mitchell Hashimoto
5fd3ab5bb0
Merge pull request #5706 from jim-minter/master
...
Remove docker0 from guest network interface enumeration
2015-07-09 14:31:00 -06:00
Mitchell Hashimoto
c65c62b2c1
Merge pull request #5880 from strzibny/fix-nfs
...
Fix: Rewrite Red Hat NFS handling based on systemd
2015-07-09 14:27:30 -06:00
Mitchell Hashimoto
3cad495064
Merge pull request #5887 from msabramo/config.ssh.ssh_command
...
Add setting config.ssh.ssh_command
2015-07-09 14:24:48 -06:00
Mitchell Hashimoto
f1618f5ec8
providers/docker: don't remove image on reload for build cache
2015-07-09 14:23:26 -06:00
Adrian Guenter
9bdefb5c59
Don't destroy built Docker image on reload
2015-07-09 16:15:56 -04:00
Mitchell Hashimoto
300b9c9109
provisioners/chef: don't check existing set, unique ID
...
[GH-5199]
2015-07-09 14:04:12 -06:00
Mitchell Hashimoto
d5458247c7
update to latest listen
2015-07-09 11:18:36 -06:00
Mitchell Hashimoto
9596b7a46c
synced_folders/rsync-auto: don't crash if rsync command fails [GH-4991]
2015-07-09 11:11:58 -06:00
Mitchell Hashimoto
d95dad9a79
synced_folders/rsync: command help [GH-5868]
2015-07-09 10:58:45 -06:00
Mitchell Hashimoto
964f340f09
synced_folders/nfs: verify_installed option [GH-5269]
2015-07-09 10:24:40 -06:00
Mitchell Hashimoto
31448d126b
synced_folders/rsync: can set rsync_path [GH-3966]
2015-07-09 10:02:38 -06:00
Mitchell Hashimoto
c1508cd893
kernel/v2: customizable sudo_command [GH-5573]
2015-07-09 09:30:47 -06:00
Mitchell Hashimoto
536ea0729b
providers/virtualbox: name for private network chooses right interface
...
[GH-5389]
2015-07-08 18:35:44 -06:00
Mitchell Hashimoto
45a5bc3bd9
kernel/v2: make provisioner name show up on invalid [GH-5902]
2015-07-08 17:50:36 -06:00
Mitchell Hashimoto
9dd87b289e
providers/docker: validate config after HandleBox [GH-5667]
2015-07-08 17:45:32 -06:00
Mitchell Hashimoto
be21604d45
providers/docker: style on custom Dockerfile
2015-07-08 16:07:57 -06:00
Mitchell Hashimoto
8d725c1f27
Merge pull request #5482 from duro/support-named-dockerfile
...
Support for Docker 1.5.0 named Dockerfile
2015-07-08 16:06:13 -06:00
Mitchell Hashimoto
0b6938d8ab
core: don't prepare folders in disable ode
2015-07-08 15:43:42 -06:00
Mitchell Hashimoto
1c203405d2
providers/docker: fix crash if host VM file can't be foundJ:wq
...
gs
2015-07-08 12:31:24 -06:00
Mitchell Hashimoto
9dd5640324
provisioners/docker: for debian, chmod the var lib docker folder
2015-07-08 12:13:25 -06:00
Mitchell Hashimoto
606a8fdde2
providers/docker: validate create args is list [GH-4850]
2015-07-08 10:25:32 -06:00
Mitchell Hashimoto
855aa66ad9
providers/docker: better error on suspend
2015-07-08 10:18:43 -06:00
Mitchell Hashimoto
dbf0af2e3f
providers/docker: don't pull if image is built
2015-07-08 10:10:43 -06:00
Mitchell Hashimoto
c2cae80de5
providers/dock: pull image prior to starting
2015-07-08 10:09:15 -06:00
Mitchell Hashimoto
26fe5ac89f
guests/tinycore: more robust rsync install
2015-07-08 09:47:48 -06:00
Mitchell Hashimoto
0d561ddf94
guests/tinycore: fix rsync install on 64-bit b2d
2015-07-07 16:21:34 -06:00
Mitchell Hashimoto
72b3ccd64f
providers/docker: use new b2d box
2015-07-07 16:06:04 -06:00
Mitchell Hashimoto
dd69de1073
communicators/ssh: only try auth methods that are valid
2015-07-07 16:06:03 -06:00
Gilles Cornu
839a2e6fa6
provisioners/ansible: show ansible-playbook only when the verbose option is enabled
...
Revert 1c884fa4e5
which introduced the
following bug:
Instead of allowing to dump the `ansible-playbook` command details when
VAGRANT_LOG=debug was defined, it was then impossible to disable this
console output when VAGRANT_LOG was undefined (in such case,
``@logger.debug ? systematically returns `true`)
In order to keep things simple and focused, it is preferable to drop the
bad idea to mix Ansible verbosity and Vagrant log level.
Fix #5803
2015-07-07 22:37:06 +02:00
Mitchell Hashimoto
9c7f666e48
provisioners/docker: support restart flag [GH-4477]
2015-07-07 12:17:24 -06:00
Pat O'Shea
da67824a53
Adding run_service and minion/master ids for windows
2015-07-07 00:24:23 -06:00
Mitchell Hashimoto
33d4f4d2a9
push/local-exec: close temp script, fix inline [GH-5695]
2015-07-06 23:42:07 -06:00
Mitchell Hashimoto
0b9ec53f46
commands/rdp: support username param [GH-5460]
2015-07-06 23:07:22 -06:00
Mitchell Hashimoto
cd18eddb1c
providers/virtualbox: fix bug, make message clearer
2015-07-06 18:18:13 -06:00
Mitchell Hashimoto
71940c60ba
providers/virtualbox: error if uid mismatch
2015-07-06 18:13:59 -06:00
Mitchell Hashimoto
92e6062f8d
Merge pull request #5622 from aneeshusa/fix-mounting-with-inactive-upstart
...
Check Upstart is running before emitting upstart events.
2015-07-06 16:20:21 -06:00
Mitchell Hashimoto
709f20b54f
Merge pull request #5651 from nspaeth/docker-download
...
Implement docker download method
2015-07-06 15:34:27 -06:00
Mitchell Hashimoto
4d4d2a4eec
Merge pull request #5731 from strzibny/rhel
...
Fix RHEL name and description
2015-07-06 15:31:26 -06:00
Mitchell Hashimoto
6c8c15b2ab
Merge pull request #5753 from jfilip/fix/master/ubuntu_vivid_hostname
...
Fix #5673 - Use hostnamectl to set the hostname on Ubuntu Vivid 15.
2015-07-06 15:28:23 -06:00
Mitchell Hashimoto
a8580353b1
Merge pull request #5773 from willdurand/fix-sed
...
guest/linux: Being able to edit a file does not mean you can write in its parent directory
2015-07-06 15:26:56 -06:00
Mitchell Hashimoto
d0b359cecf
Merge pull request #5798 from mwrock/preferipv4
...
prefer ipv4 host address over ipv6 for smb synced folders
2015-07-06 15:23:08 -06:00
Mitchell Hashimoto
bd0626672b
Merge pull request #5818 from mitchellh/issue-5790-password-in-cleartext
...
provisioner/shell: remove plaintext auth from Windows powershell
2015-07-06 15:21:47 -06:00
Mitchell Hashimoto
a0326751e6
Merge pull request #5847 from strzibny/atomic-guest
...
guest/atomic: Add Atomic guest support
2015-07-06 15:20:02 -06:00
Mitchell Hashimoto
4d2e8fd591
Merge pull request #5860 from arthurvanduynhoven/docker-provisioner-deb-fix
...
provisioner/docker: Docker Provisioner fails on Debian [ubuntu/trusty64]
2015-07-06 15:16:03 -06:00
Mitchell Hashimoto
cc2d393611
Merge pull request #5892 from PatOShea/master
...
provisioner/salt: Updated version for windows and added passing in version via vagrantfile
2015-07-06 15:11:08 -06:00
Mitchell Hashimoto
f5e38a4a14
kernel/v2: not an error if synced folder guest path is empty [GH-4833]
2015-07-06 14:58:48 -06:00
Mitchell Hashimoto
6dffec4bf9
guests/solaris11: fix suexec inheritence [GH-5247]
2015-07-06 14:23:24 -06:00
Mitchell Hashimoto
2fc8d99f6d
provisioners/file: validate source relative to Vagrantfile path
...
[GH-5252]
2015-07-06 14:22:00 -06:00
Jeff Quast
1ac3d17773
bugfix: undefined local variable or method `dir'
...
resolves bug introduced in 74d22069d4
2015-07-06 11:39:07 -07:00
Mitchell Hashimoto
fec6ef11c8
provisioners/puppet: just quiet the NFS errors for Puppet [GH-5456]
2015-07-06 11:19:32 -06:00
Mitchell Hashimoto
d03b1f6930
push/atlas: ATLAS_TOKEN env var works [GH-5489]
2015-07-06 11:01:50 -06:00
Mitchell Hashimoto
e64cef9d31
provisioners/chef: fix crash if run list is somehow nil [GH-5545]
2015-07-05 17:30:29 -07:00
Mitchell Hashimoto
262b50bc02
guests/linux: fix exception when printf is empty [GH-5846]
2015-07-05 17:14:48 -07:00
Mitchell Hashimoto
67c14c4889
guests/openbsd: add newline after insert_public_key [GH-5881]
2015-07-05 17:10:10 -07:00
Mitchell Hashimoto
36fa04fd1e
providers/virtualbox: catch subprocess launch error [GH-1483]
2015-07-05 17:01:06 -07:00
Pat O'Shea
eab702da83
Adding config to set version to install
2015-07-04 01:25:31 -06:00
Marc Abramowitz
9240ea30b6
Add setting config.ssh.ssh_command
...
Lets the user specify what ssh to use or even direct Vagrant to use an
ssh wrapper like sshrc (https://github.com/Russell91/sshrc ).
2015-07-01 23:33:13 -07:00
Dan Williams
49c4581a8c
[fedora] honor MAC address when configuring networks
...
Configuring by :interface doesn't work very well because Vagrant has
no idea about what interfaces are present in the VM, for example if
the image has 'docker' installed but not biosdevname, then
interface_names[0] = "docker0" which is usually not what you want
mapped to the first network from the Vagrantfile.
So if the plugins (like vagrant-libvirt) or the Vagrantfile has
given us a network with a MAC address, use that to find the interface
name for the network. Otherwise use slot numbers as before.
2015-06-30 16:43:36 -05:00
Josef Stribny
a151f7172a
Remove Fedora nfs cap
2015-06-30 10:23:15 +02:00
Josef Stribny
c4733a02d4
Rewrite Red Hat nfs caps based on systemd checks
2015-06-30 10:21:58 +02:00
arthurvanduynhoven
94549ab755
Need to do update before installing linux-image-extra kernel in case system is outdated.
2015-06-24 14:56:28 +02:00
Shawn Neal
1152b4e1df
Fix issue 5790
...
Leaving around plaintext username and passwords in a script on a box isn't the best from a security standpoint. This change ensures the scheduled task wrapper script for WinRM doesn't leave these around on the box, and instead passes them to the script as arguments.
2015-06-10 16:04:46 -07:00
Francesco
ca8923835a
Use the extended password parameter, more compatible
2015-06-08 04:13:23 +01:00
Matt Wrock
e6daf2f172
fix pscommand error messaging
2015-06-05 22:24:05 -07:00
Matt Wrock
ac9b0b7978
prefer ipv4 host address over ipv6 for smb synced folders
2015-06-05 06:19:58 -07:00
Matt Wrock
740877065a
marshall back command output when passing a command to ps
2015-06-05 05:07:14 -07:00
Matt Wrock
cf6d4ef5a1
clean up command encoding
2015-06-05 05:07:13 -07:00
Matt Wrock
47e57a7cd9
fix relative path
2015-06-05 05:07:12 -07:00
Matt Wrock
1cd1033093
fixes from @sethvargo comments.
2015-06-05 05:07:12 -07:00
Matt Wrock
c60a020096
adds a ps command to vagrant that drops the user into a remote powershell shell
2015-06-05 05:07:11 -07:00
Manuel Pöter
9d63ca4dd2
Acquire lock to prevent concurrent creation of master VM for the same box.
2015-06-03 13:31:43 +02:00
Seth Vargo
b92d4b21a1
Add UI::Interface#color?
2015-06-01 11:49:09 -04:00
Tim O'Guin
72e63767ac
Salt Provisioner: refactor custom install_type option to add install_command instead
2015-06-01 10:37:41 -05:00
Tim O'Guin
0b24866537
merged in master and resolved conflict in Salt provisioner docs
2015-06-01 10:07:28 -05:00
William Durand
6ff15fbedb
Being able to edit a file does not mean you can write in its parent directory
...
Interactive `sed` needs write permission on the file itself. However, it
may create a backup file, which leads to the fact that the directory
where the file is located must be writable as well. That is a side
effect because this directory does not need to be writable.
This patch fixes this side effect by editing the file in `/tmp`, and
replaces it right after.
2015-06-01 10:02:13 +02:00
Gilles Cornu
f7894d9c8c
provisioners/ansible: fix broken colorized output
...
After #5532 (e745436df3
), it was no longer
possible to enable ansible colorized output. Even though
`ANSIBLE_NOCOLOR` has no effect *at the moment* in vagrant+ansible
integration, I agree to keep it for clarity and consistence.
The new `--no-color` behaviour (bug fix #5531 ) is now covered by a unit
test.
//cc @marsam, @sethvargo
2015-06-01 08:36:09 +02:00
Seth Vargo
2daa9ed175
Merge pull request #5591 from paperlesspost/extract_shell_cmd
...
Move shell_cmd to a method in SSH::Communicator
2015-05-31 20:57:46 -07:00
Seth Vargo
3017243a24
Merge pull request #5577 from luciddg/fix/master/docker-provisioner-restart-fix
...
Use service command to restart docker, not upstart.
2015-05-31 20:44:48 -07:00
Seth Vargo
6a48af6350
Merge pull request #5532 from marsam/fix/master/ansible-no-color
...
Disable color if in ansible provisioner if Vagrant has no color
2015-05-31 20:34:06 -07:00
Seth Vargo
dc713cbd66
Merge pull request #5517 from obnoxxx/fix-freebsd-ssh-remove-key
...
guests/freebsd: fix call of set -i : missing extension
2015-05-31 20:31:04 -07:00
Seth Vargo
6309847420
Merge pull request #5512 from johnsonj/issue_3620
...
For SMB on Linux guests, specify the user's domain as a separate parameter
2015-05-31 20:19:08 -07:00
Seth Vargo
624a3200f3
Merge pull request #5478 from aogail/ignore-windows-virtual-network-connections
...
Ignore Windows NICs with nil :net_connection_id
2015-05-31 20:10:08 -07:00
Seth Vargo
f5c77765fa
Merge pull request #5437 from Jamezz/master
...
Fix issue #4152 : Salt minion bootstrapping
2015-05-31 20:08:32 -07:00
Seth Vargo
19f3c10777
Always return the version
2015-05-31 19:02:24 -07:00
Seth Vargo
30dda77454
Remove unneeded tap on nfs_client cap for Fedora
2015-05-31 19:02:23 -07:00
Seth Vargo
3fcd3d691a
Fix syntax errors and style on Fedora flavor cap
2015-05-31 19:02:23 -07:00
langdon
efd7b459dd
Add more capabilities for Fedora guests
2015-05-31 19:02:23 -07:00
Seth Vargo
6b2ef13785
Be more defensive when trying to get the line number
...
Since this is the last line of defense before raising an error, we want to make
sure we don't cause an error while trying to render the error.
2015-05-31 18:32:23 -07:00
Adam Spiers
ce13051d61
eliminate guesswork with Vagrantfile errors
...
If the Vagrantfile has some kind of error, display not only
its path and the exception message, but also the originating
line number and exception class.
Also log the full backtrace when the error is in a provider
block, just as it is done when it's outside a provider block.
2015-05-31 18:25:51 -07:00
Seth Vargo
b90807648b
Style fixes
2015-05-31 10:19:03 -07:00
Seth Vargo
e34308ec12
Merge pull request #4371 from andrewmains12/salt_orchestrations
...
Added ability to run salt orchestrations to Salt provisioner
2015-05-31 10:17:54 -07:00
Dmitry Moskalchuk
26e3994319
Add option to enable trusted HTTP redirects
2015-05-31 09:34:02 -07:00
Seth Vargo
6210f13338
Merge pull request #5750 from alh84001/feature/capability_guest_darwin_mount_smb
...
Capability to mount smb shares in darwin guests
2015-05-30 21:34:53 -07:00
Seth Vargo
01ce48ea9e
Merge pull request #5669 from taliesins/ChefProviderWindowsSupport
...
Use powershell syntax for Chef provisioner when using windows guest
2015-05-30 21:31:43 -07:00
John Cooper
7f716f4b63
Added synced_folder_args to puppet provisioner
2015-05-30 21:26:05 -07:00
Seth Vargo
f9816d89d9
Merge pull request #4867 from malonecm/GH4201-ShowRSyncOutput
...
GH-4201: Added rsync__showoutput to display rsync output to console
2015-05-30 21:21:26 -07:00
Seth Vargo
042928db9f
Merge pull request #5601 from benh57/environments_wip
...
Puppet 4 and Puppet environments support
2015-05-30 21:04:48 -07:00
Seth Vargo
50c0c487fb
Style cleanup for new name option
2015-05-30 20:57:49 -07:00
Seth Vargo
afc02ed681
Merge pull request #5607 from purpleidea/feat/named-shell
...
Add :name attribute to shell provisioner.
2015-05-30 20:54:34 -07:00
Seth Vargo
bf45aa6233
Merge pull request #4726 from databus23/patch-3
...
Add password to rdp_info hash
2015-05-30 12:18:29 -07:00
Seth Vargo
a60a05f61c
Merge pull request #5707 from dcbw/dcbw/fedora-no-biosdevname
...
fedora: don't try to use biosdevname if it's not installed
2015-05-30 12:09:06 -07:00
Seth Vargo
baaca21371
Merge pull request #5709 from linyows/fix-network-manager
...
Reload iface connection by NetworkManager
2015-05-30 12:08:15 -07:00
Seth Vargo
7dd7e1718e
Merge pull request #5558 from legal90/fix-darwin-hostname
...
Fixed error in ChangeHostName capability for Darwin
2015-05-30 12:05:11 -07:00
Seth Vargo
9dddcdb8de
Merge pull request #5691 from bergman/list-of-nics-to-bridge-to
2015-05-30 12:02:17 -07:00
Seth Vargo
08f240668b
Minor cleanup
2015-05-30 12:02:10 -07:00
Seth Vargo
464e3f5bec
Merge pull request #5749 from jeremyplichta/patch-1
...
change to https in sources.list.d
2015-05-30 11:59:05 -07:00
Seth Vargo
801d590204
Merge pull request #5730 from strzibny/fedora-releases
...
Recognize new Fedora releases
2015-05-30 11:58:18 -07:00
Seth Vargo
dadee77730
Merge pull request #5637 from paul-krohn/config-not-found-error
...
Provide path to missing file.
2015-05-30 11:55:25 -07:00
Seth Vargo
56da192878
Merge pull request #5623 from otagi/tinycore-changehostname
...
TinyCore change_host_name capability
2015-05-30 11:52:54 -07:00
Seth Vargo
2801501262
Merge pull request #5325 from frankbb/master
...
vagrant duplicates >= eth2 when defining two private network ips
2015-05-30 11:50:48 -07:00
Seth Vargo
388c2f2383
Merge pull request #5539 from vvchik/vlanid
...
HyperV provider: VlanID configuration possibility
2015-05-30 11:46:43 -07:00
Seth Vargo
39a1a5c7ba
Merge pull request #5207 from mwrock/switch_name
...
select a Hyper-V switch based on a network_name
2015-05-30 11:45:09 -07:00
David Cournapeau
3528af2db9
ENH: simpler masterless configuration.
2015-05-30 11:42:15 -07:00
Seth Vargo
0b85e04399
Minor style fixes for salt config_dir
2015-05-30 11:39:24 -07:00
David Cournapeau
74d22069d4
BUG: naive attempt at fixing #2970 .
2015-05-30 11:39:23 -07:00
Seth Vargo
a59247d4e5
Trailing comma
2015-05-30 11:01:32 -07:00
Seth Vargo
c0c7d77ea9
Merge pull request #5647 from Stanzilla/support_vb5
...
Support Virtualbox 5.0 (beta) by adding a driver, referencing it in the ...
2015-05-30 11:00:37 -07:00
Justin Filip
67cde0d9b9
Use hostnamectl to set the hostname on Ubuntu Vivid 15.
2015-05-25 16:06:51 -04:00
alh84001
1c04934d89
Mounting to paths where user has no write permissions (e.g. /)
2015-05-25 15:35:06 +02:00
Matija K
09eec472f6
Mounting as regular user instead of root
2015-05-24 15:11:34 +02:00
Matija K
b387f0e15d
Capability to mount smb shares in darwin guests
2015-05-24 12:39:28 +02:00
Jeremy Plichta
db1bd8d8c1
change to https in sources.list.d
...
I started having this problem when running the docker provisioner (Vagrant 1.7.2):
Err http://get.docker.io docker/main amd64 Packages
Undetermined Error
Err http://get.docker.io docker/main i386 Packages
Undetermined Error
Ign http://get.docker.io docker/main Translation-en_US
Ign http://get.docker.io docker/main Translation-en
Stderr from the command:
stdin: is not a tty
W: Failed to fetch http://get.docker.io/ubuntu/dists/docker/main/binary-amd64/Packages Undetermined Error
W: Failed to fetch http://get.docker.io/ubuntu/dists/docker/main/binary-i386/Packages Undetermined Error
Changing this to https seemed to fix the problem for now.
2015-05-22 15:18:11 -06:00
Mikhail Zholobov
c399f075d5
darwin/cap/change_host_name: Fixed invalid argument LocalHostName
2015-05-21 18:48:39 +03:00
Dan Williams
ccc4162ee8
fedora: don't try to use biosdevname if it's not installed
...
If biosdevname isn't installed it doesn't make sense to try using it
for persistent device names. Just treat lack of biosdevname as
virtual networking.
2015-05-19 09:22:13 -05:00
Josef Stribny
c1a26a66d1
Fix RHEL name and description
2015-05-19 12:58:19 +02:00
Josef Stribny
bd2f2fc3a0
Add Atomic guest support
2015-05-19 12:55:44 +02:00
Josef Stribny
b85248cb97
Recognize new Fedora releases
2015-05-19 10:44:25 +02:00
linyows
421fab17a2
reload connection instead of restart
2015-05-14 12:53:23 +09:00
linyows
c1c39beaab
restart NetworkManager and network for CentOS 7.1
2015-05-13 18:07:32 +09:00
Jim Minter
8e0746843d
Remove docker0 from guest network interface enumeration
2015-05-12 21:18:31 +01:00
Benjamin Staneck
7a94eba0b4
Port changes from pull request #5495 to the vb_5 module to fix #4815 here, too.
2015-05-09 02:03:33 +02:00
Joakim Bergman
2b3411965a
virtualbox: handle a list of bridged nics
...
This change allows you to specify multiple network interfaces to bridge
to, picking the first found.
```ruby
config.vm.network "public_network",
bridge: ["en4: Thunderbolt Ethernet",
"en6: Broadcom NetXtreme Gigabit Ethernet Controller",
"en0: Wi-Fi (AirPort)"]
```
2015-05-07 18:23:11 +02:00
Seth Vargo
3b10a3165a
Merge pull request #5495 from jfbibeau/windows_unc_paths
...
Proposed fix for #4815 - Windows UNC path to allow > 256 characters
2015-05-06 14:06:38 -07:00
agdula
f035664b78
fixed cmdkey arguments
...
The arguments contained not needed TTERMSRV/
2015-05-02 18:01:52 +02:00
Taliesin Sisson
9233e22974
Use powershell syntax for Chef provisioner when using windows
2015-05-02 16:21:32 +01:00
Nathan
a6f300f3e9
Implement download method
...
Use the same method as upload, in a different order
2015-04-28 15:35:39 -05:00
Benjamin Staneck
4d3e0cac62
Support Virtualbox 5.0 (beta) by adding a driver, referencing it in the list of acceptable versions/drivers, and autoloading the file in the virtualbox plugin file.
2015-04-28 17:53:48 +02:00
Ben Hines
9bbfbef977
Be a bit more robust when parsing environment.conf
2015-04-27 23:09:07 -07:00
agdula
aaebe97e8a
add RDP auto login with password
...
The fix is implementation of suggestion from @majkinetor for the closed issue
https://github.com/mitchellh/vagrant/issues/4300
Works on windows 7 host.
2015-04-27 12:09:39 +02:00
Paul Krohn
c7f32e6159
When you can't find the salt minion or master config, say what you were looking for.
2015-04-26 11:34:34 -07:00
Aneesh Agrawal
49ff17b9b9
Check Upstart is running before emitting upstart events.
...
Fixes issue #5377 .
Check that Upstart is not just installed but currently actively running
before attempting to emit an event after mounting shared folders.
Only requires the binary be named upstart, not that it lives in /sbin.
2015-04-22 09:20:27 -04:00
bmx0r
0b588e3656
Remove useless line
...
/usr/bin/sethostname will change /etc/hostname, useless to do it twice
2015-04-21 21:04:40 +02:00
Tiago Mendes-Costa
a9b8139755
Added change_host_name capability for tinycore.
2015-04-21 20:48:34 +02:00
Fabio Rapposelli
90bb760b3b
Added tests
...
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-04-20 14:56:26 -07:00
Fabio Rapposelli
21db4470a0
Add Guest support for VMware Photon.
...
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-04-20 10:13:21 -07:00
James Shubin
b16b85aa7d
Add :name attribute to shell provisioner.
...
This allows the display of friendly output to the user when we think an
important action should be labeled a certain way. This makes vagrant
output a lot more useful when many inline shell provisioners are
present.
2015-04-18 00:35:21 -04:00
Ben Hines
602227ca7d
Remove debug spam from development.
2015-04-16 00:50:53 -07:00
Shawn Neal
9de3c481de
Salt bootstrap ps1 should be idempotent
...
- WinRM communicator error detection was tightened up thus exposing an issue in the salt bootstrap script creating directories that already exist.
2015-04-14 05:57:16 -07:00
Aaron Quint
2f81669394
Move shell_cmd to a method in SSH::Communicator
...
This allows shell_cmd to be overridable by plugins/patches without
having to override the entire (large) shell_execute method
2015-04-13 13:45:17 -04:00
Ben Hines
ffcb58bcd9
When using environments, allow specifying the 'main manifest' using manifest_path and manifest_file.
2015-04-12 12:31:31 -07:00
Ben Hines
0efb9a3932
Fix resolution of puppet path for <4.0
2015-04-12 12:29:50 -07:00
Ben Hines
b40426aca5
Properly parse out and use the environment's manifest file which is specified in environment.con.
2015-04-12 02:16:54 -07:00
Ben Hines
c8f300e5f5
Correct environment path option to puppet apply.
2015-04-12 01:43:19 -07:00
Ben Hines
c701bab253
Properly handle various combinations of Puppet options being specified.
2015-04-12 01:26:41 -07:00
Ben Hines
cff7c52716
Use localized error message. Update strings for puppet provisioner errors.
2015-04-12 01:25:40 -07:00
Ben Hines
7a4e7929f8
Don't parse env metadata until provisioning time. TBD: make it functional
2015-04-12 01:18:49 -07:00
Ben Hines
3ee47acb42
Remove debug output
2015-04-12 01:18:12 -07:00
Ben Hines
e2c68fc12d
Correct environment path config name.
2015-04-11 23:48:18 -07:00
Ben Hines
3a2a9a3b94
Add a binary_path option to the puppet provisioner to match the chef provisioner, and support new puppet 4 install location.
2015-04-11 23:35:25 -07:00
Ben Hines
cf847e0410
Merge branch 'master' into environments_wip
...
Conflicts:
Vagrantfile
vagrant.gemspec
2015-04-11 13:33:32 -07:00
Ben Hines
e8843b8648
Merge branch 'master' of https://github.com/mitchellh/vagrant
2015-04-11 13:03:18 -07:00
Brandon Matthews
c0f43c362c
Use service command to restart docker, not upstart.
...
upstart ships by default on Ubuntu, but not on Debian, and service works
everywhere. Fixes #5245 .
2015-04-10 10:06:21 -07:00
Jean-Francois Bibeau
415837c544
moved function to platform utils, added unit test as per @sethvargo
2015-04-06 16:51:55 -04:00
Seth Vargo
13d4899d16
Cleanup style
2015-04-02 10:11:41 -04:00
wucheng
ca3cb385d4
fix ftp push check bug
...
list method is not safe to check if a dir exist or not on remote.
2015-04-02 14:44:11 +08:00
Jeff Johnson
9d50f72df3
For SMB on Linux guests, specify the user's domain as a separate parameter to the mount command. This is more reliable than passing user@domain as the username. This is not needed for SMB on Windows guests as they expect the user@domain form.
...
This does not change how it is configured in the Vagrantfile.
Fixes #3620
2015-03-31 08:16:06 -07:00
Volodymyr Babchynskyy
9a0aab4bd7
Improved behavior for case if vlan_id is not set
2015-03-30 10:17:29 -06:00
Volodymyr Babchynskyy
9e23d16d9c
merged vlan_id changes for hyperv by tomassrnka
2015-03-30 08:37:29 -06:00
ssugar
fd557592d4
only set EFI secure boot for gen 2 machines in hyperv provider
2015-03-30 20:00:16 +07:00
Mario Rodas
e745436df3
provisioners/ansible: disable color if Vagrant has no color [GH-5531]
2015-03-28 19:05:54 -05:00
Michael Adam
b43413525f
guests/freebsd: fix call of set -i : missing extension
...
Sed on freebsd seems to be mores strict than on other
platforms about use of -i: the extension is not optional.
Signed-off-by: Michael Adam <obnox@samba.org>
2015-03-23 13:31:07 +01:00
Jean-Francois Bibeau
7d17574a76
changing windows/virtualbox shared path names to UNC format to allow > 256 characters
2015-03-18 15:29:43 -04:00
Adam Duro
be81f09a60
Supporting a named Dockerfile for Docker 1.5.0
2015-03-13 17:30:42 -07:00
Ben Jansen
992c148169
Ignore Windows NICs with nil :net_connection_id
...
When upping a Win XP box, vagrant found a lot of "virtual" network
connections that did not have DHCP enabled, and tried to configure them
for DHCP. This did not work because their :net_connection_id is nil.
Ignoring these network connections enabled the XP box to be upped.
2015-03-13 11:49:15 -07:00
Paul Hinze
291db96510
communicators/winrm: don't stop task on idle end
...
StopOnIdleEnd was set in the task definition for elevated/privileged
windows guest scripts. This setting:
> specifies that the task stops when the idle condition ceases to be true [1]
The "idle condition" is something that Windows periodically checks for,
and it's defined by a bunch of criteria like user presence/absence, CPU
/ IO idle time, etc. [2]
Telling our provisioner to stop the task if the "idle condition" ceases
to be true is a recipe for some sporadically stopped tasks, which seems
like precisely the behavior being reported in #5362 .
I'm pretty sure this fixes #5362
[1] https://msdn.microsoft.com/en-us/library/cc248332.aspx
[2] https://msdn.microsoft.com/en-us/library/windows/desktop/aa383561%28v=vs.85%29.aspx
2015-03-12 15:25:40 -05:00
Jamezz
71c40bdf6a
File architecture string should be x86
...
As of 2014.7.0, Salt has changed their file naming for 32-bit from win32
to x86.
2015-03-06 13:14:11 -08:00
Jamezz
2f4a0af5d1
Fix issue #4152 : Salt minion bootstrapping
...
Copy the config after we know the installer exits. Also rev the
installed version to 2014.7.1 (latest stable as of 3/4/2015)
2015-03-04 18:08:07 -08:00
Tim O'Guin
0289ab986c
Salt Provisioner: Added a 'custom' option to install_type to allow more flexibility in passing arguments to the bootstrap script. Updated the docs.
2015-03-04 15:05:24 -07:00
Mitchell Hashimoto
4f44ae5379
providers/virtualbox: interpolation added to error [GH-5308]
2015-02-24 10:48:59 -08:00
Mitchell Hashimoto
713be4c5b9
provisioners/chef: actually use command -v
2015-02-24 10:12:25 -08:00
Mitchell Hashimoto
c1e2d36090
provisioners/chef: use command -v to check for binary [GH-5167]
2015-02-24 10:11:05 -08:00
Mitchell Hashimoto
808a86a918
Merge pull request #5175 from hdeheer/patch-1
...
synced/folders/rsync Add 'IdentitiesOnly=yes'
2015-02-24 10:06:24 -08:00
Mitchell Hashimoto
66b199afb7
Merge pull request #5182 from clintoncwolfe/add-ssh-key-replacement-for-solaris
...
guests/solaris: Add insert/remove public key guest capability for solaris
2015-02-24 10:05:17 -08:00
Mitchell Hashimoto
47ea548026
Merge pull request #5210 from tomassrnka/5209-vm-import-secure-boot
...
providers/hyperv: import respects box's original Secure Boot setting
2015-02-24 10:03:13 -08:00
Mitchell Hashimoto
4e32155b95
Merge pull request #5261 from blairham/revert-4693-master
...
Revert "Rename Windows guest without reboot"
2015-02-24 09:59:53 -08:00
Mitchell Hashimoto
eca5ab0a4d
Merge pull request #5277 from Keeguon/fedora21
...
detect fedora 21
2015-02-24 09:58:20 -08:00
Mitchell Hashimoto
8e76ff64d2
Merge pull request #5282 from Scythril/windows_rsync_pre
...
guests/windows: windows rsync needs to create folders before syncing
2015-02-24 09:49:57 -08:00
Mitchell Hashimoto
55d54b5832
Merge pull request #5290 from channui/solaris11-plugin
...
guests/solaris11: Copy linux support for insert_public_key and remove_public_key to solari...
2015-02-24 09:48:02 -08:00
Mitchell Hashimoto
104f2106ce
Merge pull request #5302 from cubetto/fix-docker-no-space-to-build
...
providers/docker: build docker image from /var/lib/docker
2015-02-24 09:47:08 -08:00
Mitchell Hashimoto
2dfc1e1c49
Merge pull request #5303 from SchnWalter/add-sl7-flavor
...
guests/redhat: Add Scientific Linux to RHEL 7 flavors.
2015-02-24 09:45:56 -08:00
Mitchell Hashimoto
734b0d6695
Merge pull request #5315 from jimmidyson/non-existent-docker-group
...
provisioners/docker: only add user to docker group if docker group exists
2015-02-24 09:45:03 -08:00
Mitchell Hashimoto
d399bdae8f
Merge pull request #5320 from epicagency/master
...
providers/virtualbox: support Regexp usage for bridge configuration
2015-02-24 09:43:36 -08:00
Mitchell Hashimoto
e5d3a561cf
Merge pull request #5326 from timsutton/ssh-insert-key-darwin
...
guests/darwin: Support insert_public_key and remove_public_key on darwin guest
2015-02-24 09:36:41 -08:00
Mitchell Hashimoto
7900fc65fc
Merge pull request #5349 from agreenbhm/master
...
hosts/windows: update host_info.ps1
2015-02-24 09:26:27 -08:00
gpkfr
c01c4bf41e
remove extra spaces on plugin.rb ;).
2015-02-20 20:49:50 +01:00
gpkfr
1eedc2b5f1
Added specific support for Debian 8 (aka jessie) to permit proper vagrant halt execution
2015-02-20 20:15:05 +01:00
agreenbhm
a1f6bfb1f2
Update host_info.ps1
2015-02-18 11:53:03 -05:00
agreenbhm
2557e5f3f8
Update host_info.ps1
...
Changed method for getting IP addresses. Windows built-in VPN IP addresses do not appear in list using Get-WMIObject, causing shared folders to fail.
2015-02-17 13:04:54 -05:00
Shawn Neal
92762eeb8c
Merge pull request #4943 from maxlinc/winrm_error_handling
...
Improved WinRM error handling (including better `ready?` and `wait_for_ready`)
2015-02-16 10:16:14 -08:00
Max Lincoln
583254b2b7
Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling
...
Conflicts:
plugins/communicators/winrm/config.rb
plugins/communicators/winrm/shell.rb
test/unit/plugins/communicators/winrm/shell_test.rb
2015-02-16 10:30:12 -05:00
Michael Lopez
8adc10f295
Update chef_zero provisioner to use real chef-zero/local-mode to support cookbook version constraint
2015-02-14 22:32:16 +01:00
Michael Lopez
74ffcb27d6
Add 'enable_reporting' attribute for chef provisioner
2015-02-14 22:28:32 +01:00
Timothy Sutton
c6e16beaa5
Support insert_public_key and remove_public_key on darwin guest
...
- fixes #5204
- darwin-specific sed arguments thanks to @elatt
2015-02-11 12:21:23 -05:00
Frank Baalbergen
90719dc82f
vagrant duplicates >= eth2 when defining two config.vm.network :private_network
...
When a vagrant box has two private network ips /etc/network/interfaces
will duplicate eth2 and bigger. sed matches greedy, so the first
#VAGRANT-END matches. This will result in:
/etc/network/interfaces:29: interface eth2 declared allow-auto twice
/sbin/ifup: couldn't read interfaces file "/etc/network/interfaces"
2015-02-11 15:37:41 +01:00
Hugues Lismonde
887f94260e
Support Regexp usage for bridge configuration
2015-02-11 11:07:03 +01:00
Jimmi Dyson
be2643d40d
Only add user to docker group if docker group exists (doesn't in recent Fedora docker-io installs)
2015-02-10 18:11:39 +00:00
Max Lincoln
d6e91483a6
Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
...
Conflicts:
vagrant.gemspec
2015-02-09 11:10:23 -05:00
Schneider Werner-Walter
02c0bfafc6
Add Scientific Linux to RHEL 7 flavors.
2015-02-08 02:56:44 +02:00
cubetto
2e659bf12c
Update host_machine_build_dir.rb
2015-02-07 20:33:55 -03:00
Christopher Chan-Nui
a6361a750c
Copy linux support for insert_public_key and remove_public_key to solaris11.
2015-02-04 16:58:17 -06:00
Seth Vargo
7d25a687ca
Add tests for sending metadata
2015-02-04 11:45:02 -05:00
Seth Vargo
257ff57772
Remove message for now
2015-02-03 21:06:51 -05:00
Seth Vargo
82b24e9a8f
Pass in a message to the command as well
2015-02-03 19:20:27 -05:00
Seth Vargo
d29a474fbb
Cleanup that syntax
2015-02-03 19:20:12 -05:00
Seth Vargo
edbc3e74d4
Pass metadata to push command
2015-02-03 19:19:51 -05:00
Seth Vargo
52d0df3296
Add --message option to `vagrant push`
2015-02-03 19:19:08 -05:00
Félix Bellanger
b776fe74b8
detect fedora 21
2015-02-03 10:23:35 +01:00
Blair Hamilton
7784ee2d09
Revert "Rename Windows guest without reboot"
2015-01-28 20:00:24 -05:00
Max Lincoln
39882957ee
Add retry_delay setting to speed up test
2015-01-28 13:41:07 -05:00
Max Lincoln
5d5e13bc0f
Change authorization error tests to match WinRM 1.3
2015-01-28 13:41:07 -05:00
Richard Guin
56a6c85e7d
Windows rsync needs to create folders before syncing
2015-01-28 13:07:36 -05:00
Max Lincoln
c37c12526a
Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling
...
Conflicts:
vagrant.gemspec
2015-01-28 10:44:47 -05:00
Shawn Neal
6378deacd6
Merge pull request #5225 from mitchellh/winrm-fs-dependency
...
Use winrm-fs for file uploads
2015-01-26 09:55:31 -08:00
Paul Hinze
88ab9f7402
providers/virtualbox: read netmask from dhcpservers
...
This should fix the cleaning up of the default VirtualBox dhcpserver,
which we've been fighting with for ages over in #3083 . We were checking
for a structure _including_ a netmask, but the driver was not populating
netmask.
2015-01-21 10:51:39 -08:00
Max Lincoln
a317a4d50d
Ensure allowed_synced_folder_types is a list of symbols
2015-01-20 16:18:05 -05:00
Max Lincoln
d781dce8f8
Filter synced folders by allowed_synced_folder_types
2015-01-20 16:18:05 -05:00
Max Lincoln
29845e926c
Merge branch 'master' into winrm_error_handling
2015-01-20 16:16:48 -05:00
Max Lincoln
edc867986b
Merge branch 'master' into winrm_error_handling
2015-01-20 16:07:00 -05:00
Max Lincoln
e07f229f6e
Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
2015-01-20 16:00:20 -05:00
Shawn Neal
31163da0d5
Use winrm-fs for file uploads
...
Replace the Vagrant native winrm file upload functionality with the winrm-fs gem.
2015-01-20 11:45:57 -08:00
Seth Vargo
0cfe5ebfa6
Merge pull request #5222 from simonjbeaumont/fix-regex
...
Allow colon in NFS ID regex
2015-01-20 09:58:31 -05:00
Seth Vargo
8519e174f0
Merge pull request #5220 from voxik/fix-permissions
...
Remove unneeded executable permissions.
2015-01-20 09:53:48 -05:00
Si Beaumont
3deed353ae
Allow colon in NFS ID regex
...
Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
2015-01-20 14:11:42 +00:00
Vít Ondruch
7d3b5352da
Remove unneeded executable permissions.
2015-01-20 11:53:30 +01:00
Clay Allsopp
69b7200c35
Switch to docker.com
...
docker.io seems to be deprecated & handled differently from docker.com; see https://twitter.com/clint_newsom/status/557290529810313217
2015-01-19 13:58:45 -08:00
Tomas Srnka
21e2f33fb0
Fix for: [hyperv]: VM import process does not respect Secure Boot option from image #5209
2015-01-17 21:31:37 +01:00
Matt Wrock
87195f8336
use :bridge instead of network_name to align with site docs
2015-01-17 11:39:32 -08:00
Matt Wrock
0b6e65380a
select a switch ased on a network_name
2015-01-17 01:06:56 -08:00
Volodymyr Babchynskyy
a9ac168b19
Added possibility to configure memory, cpus count, and vmname in vagrantfile
2015-01-14 16:59:01 +02:00
Clinton Wolfe
75de0e3dd7
Add insert/remove public key guest capability for solaris (identical to linux)
2015-01-13 21:45:06 -05:00
Clinton Wolfe
17a0d08040
Add chef_install(ed?) guest capability for omnios
2015-01-13 17:45:01 -05:00
Gilles Cornu
cdd5d54208
provisioners/ansible: fix a typo in a comment
...
[ci skip]
2015-01-13 18:52:47 +01:00
Hubert
7e5391c0f5
synced/folders/rsync Add 'IdentitiesOnly=yes'
...
Added IdentiesOnly=yes to avoid "Too Many Authentication Failures" error
2015-01-12 15:19:43 +01:00
Gilles Cornu
28e0646dc2
Fix typo error in CHANGELOG
...
Close #4860
[ci skip]
2015-01-12 10:59:07 +01:00
Gilles Cornu
2ecad8bb93
provisioners/ansible: increase connection timeout
...
This change helps to avoid troubles like reported in #5018 and #4860 .
Note that for sake of configuration simplicity, no new `ansible.timeout`
option has been added. The users who want to set a different value can
rely on `ansible.raw_arguments`.
2015-01-12 10:54:01 +01:00
Gilles Cornu
c3cae3d235
provisioners/ansible: add `IdentitiesOnly=yes`
...
This SSH option is always set, except when Vagrant is running from an
operating system fo the Solaris-family, as this parameter is not
supported by SunSSH. Logic taken from
bed1f8335f/lib/vagrant/util/ssh.rb (L116-L121)
Fix #5017
2015-01-12 08:58:29 +01:00
Seth Vargo
114858c7d2
Verify the token is valid when saving
2015-01-09 13:24:53 -05:00
Seth Vargo
253f0637e5
Add a -t command for setting the login token
2015-01-08 17:16:21 -05:00
Dan Carley
7529b66ea2
Disable insert_key for boot2docker host
...
Vagrant >1.7 is unable to login to the default boot2docker host if it has
been halted and brought back up again.
This is because the insecure SSH keypair is replaced but boot2docker doesn't
persist filesystem changes between reboots. So when next brought up Vagrant
tries to use the new keypair which is no longer valid and subsequently isn't
able to login.
Prevent this from happening by disabling the `ssh.insert_key` option on
versions where it is available.
2015-01-08 11:23:37 +00:00
Seth Vargo
39233e802f
Validate pushes in the global config
2015-01-07 15:51:20 -05:00
Seth Vargo
6b51526ba2
Validate push configuration in the environment
2015-01-07 11:43:26 -05:00
Seth Vargo
e828719c2f
Add logging to vagrant-login
2015-01-07 11:43:14 -05:00
Mitchell Hashimoto
95e1c19f22
provisioners/puppet: fix exception with module paths [GH-5123]
2015-01-06 22:50:24 -08:00
Seth Vargo
1fdee9e5c4
Merge pull request #4813 from derdanne/funtoo-guest-network-configuration
...
Update configure_networks.rb for funtoo
2015-01-06 16:49:44 -05:00
Mitchell Hashimoto
661657c63f
provisioners/chef: fix failing test
2015-01-06 10:57:25 -08:00
Mitchell Hashimoto
5b4b387f04
provisioners/chef: fix failing tests
2015-01-06 10:56:28 -08:00
Mitchell Hashimoto
de6b55d007
provisioners/puppet: use predictable synced folders
2015-01-06 10:48:31 -08:00
Mitchell Hashimoto
155516fb6c
provisioners/chef: use synced folder cache instead of counter
2015-01-06 10:31:13 -08:00
Mitchell Hashimoto
79873cdb44
communicators/winrm: detect parse errors in powershell and error
...
/cc @sneal - Any better way to do this?
2015-01-05 16:53:17 -08:00
Seth Vargo
7609932a6f
Do not use keyword arguments for string keys
2015-01-05 18:58:57 -05:00
Seth Vargo
d2874064f4
Use .key? instead of .has_key?
2015-01-05 18:29:01 -05:00
Seth Vargo
5e0f91f592
ENV returns nil, not empty strings
2015-01-05 16:04:00 -05:00
Seth Vargo
2bd22c9663
Turn on Atlas debug logging if Vagrant is logging
2015-01-05 15:51:19 -05:00
Chad Maloney
dd62d3c5f1
Merge branch 'master' into GH4201-ShowRSyncOutput
2015-01-05 14:42:08 -06:00
Chad Maloney
d2e1500c74
Review comments applied. Removed changelog. Changed showoutput to verbose.
2015-01-05 14:36:00 -06:00
Mitchell Hashimoto
c4502737c8
Revert "Symbolize and stringify keys in options hash"
...
This reverts commit 1699c92eec
.
2015-01-05 12:35:31 -08:00
Mitchell Hashimoto
d5dae4b492
Merge pull request #5042 from legal90/fix-post-comm
...
providers/virtualbox: Add 'post-comm' to the list of valid events
2015-01-05 12:00:34 -08:00
Mitchell Hashimoto
d482e0ca10
Merge pull request #5085 from evverx/provision-with
...
Enable provision with --provision-with flag
2015-01-05 11:45:10 -08:00
Mitchell Hashimoto
4849ec8f7c
guests/solaris: merge config properly [GH-5092]
2015-01-05 09:52:19 -08:00
Mitchell Hashimoto
d5c1c28a2b
Merge pull request #5094 from wkolean/docker-vbox-symlink-fix
...
enable symlinks before adding shared folder
2015-01-05 09:49:56 -08:00
Mitchell Hashimoto
9ce626854d
Merge pull request #5102 from tomassrnka/master
...
Fix catching "Start-VM" exceptions on Hyper-V during starting up VM
2015-01-05 09:44:01 -08:00
Seth Vargo
1699c92eec
Symbolize and stringify keys in options hash
2015-01-05 10:48:39 -05:00
Mitchell Hashimoto
5903bfb3c6
commands/push: validate configuration
...
/cc @sethvargo - Some weirdness here but overall should work fine. I'm
not sure if there was a GH issue this should be attached to or close. To
explain:
We just use the first machine with the default provider. A
Vagrant::Environment guarantees there is at least one machine, so
`env.machine_names.first` will always work. And we can just use the
default provider because we don't really care. Finally, it can be any
old machine we pass in because we just want the "global" config to
validate and there is no way to say "don't validate machine-specific
configs", so we might as well just pick the first machine to validate.
2015-01-04 15:43:30 -08:00
Seth Vargo
f11ec8ff1a
Make parent directories when uploading to FTP
2015-01-04 18:06:51 -05:00
Seth Vargo
6a3d99a9a2
Output to the UI when uploading via FTP
2015-01-04 18:06:32 -05:00
Seth Vargo
50c1c0756e
Expand file paths relative to the root_path
2015-01-04 18:06:22 -05:00
Seth Vargo
fd3c1c6ebb
Add a logger when uploading to FTP
2015-01-04 18:06:05 -05:00
Seth Vargo
e330875303
Exclude certain directories by default
2015-01-04 18:05:46 -05:00
Seth Vargo
e7391359e8
Remove duplicate #parse_host method
2015-01-04 18:05:17 -05:00
Seth Vargo
944853ab47
Use 21 for the default port
2015-01-04 16:24:26 -05:00
Tomas Srnka
2620042c26
Fix catching "Start-VM" exceptions on Hyper-V during starting up VM
2015-01-04 00:05:50 +01:00
William Kolean
084d2c06de
enable symlinks before adding shared folder
2015-01-01 16:00:17 -05:00
Andrew Mains
9aa20d5d6b
Added ability to run salt orchestrations to salt provisioner
2014-12-31 10:31:35 -08:00
Evgeny Vereshchagin
43bb715c00
Enable provision with --provision-with flag
2014-12-30 06:10:52 +03:00
Seth Vargo
97d5a6ebfc
Log chef-zero instead of chef-solo
2014-12-28 12:52:54 -05:00
evverx
1cfc5acea3
Update Chef plugin description
2014-12-24 03:53:29 +03:00
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
Seth Vargo
62065e013a
Read and return login errors from Atlas
2014-12-08 18:26:36 -08:00
Seth Vargo
3d8a1ec3fc
Fix some rename shit
2014-12-08 18:26:36 -08:00
Seth Vargo
b973186cb5
Add vagrant-login to core ;)
2014-12-08 18:26:36 -08:00
Seth Vargo
2e4f854725
Vagrant Cloud -> Atlas
2014-12-08 17:42:29 -08:00
Seth Vargo
fa7cd37e42
Send the Atlas token
2014-12-08 16:54:19 -08:00
Gilles Cornu
118e223c33
provisioners/ansible: use Docker proxy when needed
...
Close #4071
Credits and best thanks to @jabclab
2014-12-08 21:43:21 +01:00
Gilles Cornu
15679f76f8
Merge pull request #4883 from mitchellh/gc-vagrant-1.7-ansible-provisioner
...
Non-trivial changes and bug fixes for the Ansible provisioner
2014-12-08 21:29:24 +01:00
Seth Vargo
9e5b587e66
Re-add TODO
2014-12-08 11:35:15 -08:00
Seth Vargo
70b61047c7
Do not support multiple strategies right now
2014-12-08 11:35:15 -08:00
Seth Vargo
6b48199346
Infer push name when only one strategy is defined, support multiple strategies
2014-12-08 11:35:15 -08:00
Mitchell Hashimoto
4a64da5663
Fix some issues around push, fix tests, add missing translations
2014-12-08 11:35:15 -08:00
Mitchell Hashimoto
44e6ec6df8
pushes/atlas: support custom server address
2014-12-08 11:35:15 -08:00
Mitchell Hashimoto
998c5688e8
pushes/atlas: Look for the uploader bin in the embedded dir
2014-12-08 11:35:15 -08:00
Seth Vargo
ede14d7daa
Separate local-exec push `script` from `inline`
2014-12-08 11:35:14 -08:00
Seth Vargo
612eeb2265
Add local-exec push
2014-12-08 11:35:14 -08:00
Seth Vargo
9d1a43c766
Interpret the app from the CWD
2014-12-08 11:35:14 -08:00
Seth Vargo
7e3de3951e
Do not check for a branch until after we have found git
2014-12-08 11:35:14 -08:00
Seth Vargo
b9e8f6e892
Interpret the current branch to push to Heroku
2014-12-08 11:35:14 -08:00
Seth Vargo
1f49b7ef62
Remove branch option (it should be interpreted)
2014-12-08 11:35:14 -08:00
Seth Vargo
ce380a3b12
Remove safe_exec (not being used)
2014-12-08 11:35:13 -08:00
Seth Vargo
4282fcf55e
Add heroku push plugin file
2014-12-08 11:35:13 -08:00
Seth Vargo
c16dc5c9c9
Add heroku push implementation
2014-12-08 11:35:13 -08:00
Seth Vargo
d4058130e4
Add heroku config
2014-12-08 11:35:13 -08:00
Seth Vargo
fb05563762
Load the translations in Atlas
2014-12-08 11:35:13 -08:00
Seth Vargo
1d7f4f26be
Provide a better error message for the FTP push
2014-12-08 11:35:13 -08:00
Seth Vargo
dc8b36b31d
Allow = methods for include and exclude
2014-12-08 11:35:13 -08:00
Seth Vargo
ed605c9aac
Rename Harmony to Atlas, minor config changes
2014-12-08 11:35:13 -08:00
Seth Vargo
c8bdf53c7e
Rename push environment to env
2014-12-08 11:35:12 -08:00
Seth Vargo
8aaf5dc578
Add the FTP push
2014-12-08 11:35:12 -08:00
Seth Vargo
80851a887f
Create an Adapter to bridge the APIs between SFTP and FTP libraries
2014-12-08 11:35:12 -08:00
Seth Vargo
eb5cecc782
Create ftp push plugin with custom i18n loading
2014-12-08 11:35:12 -08:00
Seth Vargo
b90253ea8c
Create ftp push config
2014-12-08 11:35:12 -08:00
Mitchell Hashimoto
913dafd3aa
pushes/harmony: remove unneceessary if
2014-12-08 11:35:12 -08:00
Mitchell Hashimoto
81f748347e
pushes/harmony: fixes from @sethvargo
2014-12-08 11:35:12 -08:00
Mitchell Hashimoto
fefaa8da71
pushes/harmony: use to_s.strip.empty? to check if app is set
2014-12-08 11:35:12 -08:00
Mitchell Hashimoto
1705460880
pushes/harmony: expand dir relative to Vagrantfile root path
2014-12-08 11:35:12 -08:00
Mitchell Hashimoto
f3f4f4aeb6
pushes/harmony: stub I18n
2014-12-08 11:35:12 -08:00
Mitchell Hashimoto
efffc5f2f7
push/harmony: basic push implementation
2014-12-08 11:35:11 -08:00
Mitchell Hashimoto
168715ad7d
push/harmony: ability to set uploader path
2014-12-08 11:35:11 -08:00
Mitchell Hashimoto
e7b0661a93
pushes/harmony: boilerplate, config
2014-12-08 11:35:11 -08:00
Seth Vargo
9af7675bd3
Use a more readable version for setter
2014-12-08 11:35:11 -08:00
Seth Vargo
1121e96cf7
Remove TODO comment about duplicate code
2014-12-08 11:35:11 -08:00
Seth Vargo
411c7d6f75
Define finalize! and __compiled_pushes for Push config
2014-12-08 11:35:11 -08:00
Seth Vargo
190da26404
Push does not have access to @machine
2014-12-08 11:35:10 -08:00
Seth Vargo
03b8105571
Super primitive implementation of Environment#push
2014-12-08 11:35:10 -08:00
Seth Vargo
b6c5ca6b7a
Add Push command and tests
2014-12-08 11:35:10 -08:00
Seth Vargo
0e824cc471
Rename file push to noop push
2014-12-08 11:35:09 -08:00
Seth Vargo
8a7e546972
Add preliminary File pusher (incomplete)
2014-12-08 11:35:09 -08:00
Atha Kouroussis
9e9362d976
Fix broken rsync cap for Solaris guests
2014-12-08 09:42:13 -05:00
Gilles Cornu
3800103228
provisioners/ansible: improve comment wording
...
Get rid of the Joker, thanks to @maspwr :)
2014-12-07 22:34:19 +01:00
Gilles Cornu
40a22ff99a
providers/docker: fix support of agent forwarding
2014-12-07 11:02:50 +01:00
Jeff Quast
c6cce57ff4
Avoid double-newlines in salt-call output
...
When using the salt provisioner with verbose=true, most lines read with an extra newline:
```
[INFO ] Syncing modules for environment 'base'
[INFO ] Loading cache from salt://_modules, for base)
```
because the line read has a newline, and emitting the log entry again includes an additional newline.
2014-12-03 21:48:30 -08:00
Chad Maloney
a2778c0a6b
Merge branch 'master' into GH4201-ShowRSyncOutput
2014-12-03 13:11:56 -06:00
Ken Crowell
72afdce630
Issue #4895 : Support grains config for salt
2014-12-02 18:01:09 -04:00
Paul Hinze
25ff636ee2
providers/virtualbox: cleanup default vbox dhcp server
...
fixes #3083
Detect the presence of the default DHCP server that comes in a fresh
VirtualBox install and clean it up to prevent it from colliding with
Vagrant-managed network config.
In order to accomplish this, we:
- add a `remove_dhcp_server` call to the virtualbox driver
- fix dhcp options parsing to allow `:dhcp_{ip,lower,upper}`
configuration options to make it through (so a user can override the
removal behavior with some explicit configuration)
- add the full `:network_name` to the details returned from
`:read_dhcp_servers`, so we can have a durable value to pass to
`:remove_dhcp_server`
Note that we do have to eat one more `VBoxManage list dhcpservers` for
each network interface to support this, but this seemed like a nominal
cost
2014-11-30 22:03:52 -06:00
Paul Hinze
24b6f21d1d
providers/virtualbox: extract reading dhcpservers from hostonlyifs
...
This is just a refactor, no behavior change.
Instead of stitching together dhcpserver info in the structure returned
from `read_host_only_interfaces`, sprout a new driver method called
`read_dhcp_servers` to return that information separately.
This means that driver clients (well there's really only _one_ client in
`ProviderVirtualBox::Action::Network`) have to do a bit more work to get
interface and DHCP server information.
But this gives us (a) a cleaner and more consistent driver interface and
(b) groundwork for a fix for #3083 , which will require interacting with
DHCP servers outside of the context of host-only interfaces.
2014-11-30 22:03:52 -06:00
Gilles Cornu
f96636587a
provisioners/ansible: don't read/write known_hosts
...
Like Vagrant's default SSH behaviors (e.g ssh or ssh-config commands),
the Ansible provisioner should by default not modify or read the user
known host file (e.g. ~/.ssh/known_hosts).
Given that `UserKnownHostsFile=/dev/null` SSH option is usually combined
with `StrictHostKeyChecking=no`, it seems quite reasonable to bind the
activation/disactivation of both options to `host_key_checking`
provisioner attribute.
For the records, a discussion held in Ansible-Development mailing list
clearly confirmed that there is no short-term plan to adapt Ansible to
offer an extra option or change the behavior of
ANSIBLE_HOST_KEY_CHECKING. For this reason, the current implementation
seems reasonable and should be stable on the long run.
Close #3900
Related References:
- https://groups.google.com/forum/#!msg/ansible-devel/iuoZs1oImNs/6xrj5oa1CmoJ
- https://github.com/ansible/ansible/issues/9442
2014-11-30 09:55:48 +01:00
Gilles Cornu
178942cf27
provisioners/ansible: change arguments arrangement
...
- force `--connection=ssh` (any other modes like paramiko or smart are not
supported)
- give the highest priority to `raw_arguments` for sake of simplicity (in
usage, in code and in documentation)
- fix position of the `--limit` argument (the generated inventory could be
shadowed by `raw_arguments`, while ansible.limit was able to override
`raw_arguments`
ref #3396
2014-11-30 09:50:50 +01:00
Gilles Cornu
306c4f7eda
provisioners/ansible: force --connection=ssh
...
When `--connection` argument is not specified, Ansible will use the
'smart' mode, which can either use `ssh` or `paramiko` transports,
depending of the version of OpenSSH available. If OpenSSH version is new
enough to support ControlPersist technology, `ssh` will be used.
See also http://docs.ansible.com/intro_configuration.html#transport .
In order to support some advanced features of Vagrant (e.g. multiple ssh
private key identities or ssh forwarding), the Ansible provisioner
already must force `ssh` connection mode.
Having to deal with the possible fallback to `paramiko` increase the
burden of special cases that Ansible provisioner must handle, without
any added value, as Vagrant is based on OpenSSH and its users are
usually using modern operating systems.
With this change, the Ansible provisioner will officially only support
`ssh`. It will still be possible to switch to another connection mode
via `raw_arguments`, but it will breach the "contract", and no
(community) support can be expected in such use case.
ref #3900 , #3396
2014-11-30 09:50:50 +01:00
Chad Maloney
1ed31afeba
GH-4201: Cleaned up some leftover junk I missed removing
2014-11-25 14:39:56 -06:00
Chad Maloney
cf784d5d3c
GH-4201: Split process output by line so prefix shows on each line. Also fixed localization reference.
2014-11-25 14:37:59 -06:00
Chad Maloney
5de3f30bb0
GH-4201: Added rsync__showoutput to display rsync output to console
2014-11-25 12:38:41 -06:00
Gilles Cornu
1c884fa4e5
provisioners/ansible: Show Ansible command when VAGRANT_LOG=debug
2014-11-25 08:12:43 +01:00
Daniel Klockenkämper
8066c38881
Update configure_networks.rb for funtoo
...
fixed name of temporary network configuration file to work with the further process of copying file to configuration directory
2014-11-11 15:12:48 +01:00
Seth Vargo
f86189a2fe
Add Env.with_clean_env for resetting the Ruby and Rubygems environment
2014-11-10 12:00:23 -05:00
Seth Vargo
f232dc38c9
Automatically install Chef when provisioning with Chef
2014-11-07 15:56:22 -05:00
Seth Vargo
a8fa4bccc7
Add Chef::Config#install and Chef::Config#version options
2014-11-07 15:56:21 -05:00
Seth Vargo
8f35ecaa6f
Extract runner-specific Chef configs into their own subclass
...
This separates the truly basic pieces of Chef (like install url and
log_level) from the runner pieces of Chef (like provisioning_path). This
is necessary because the Chef Apply provisioner does not actually need
most of the Chef configuration options.
2014-11-07 15:56:21 -05:00
Chris Jones
b19abebdf0
Grammar fix to the network interface bridge question
2014-10-31 15:16:02 -04:00
Seth Vargo
59eb0ad2e8
Add Chef Apply provisioner
2014-10-30 15:32:15 -04:00
Seth Vargo
514101816b
Fix alignment in the Chef Client config
2014-10-30 15:32:10 -04:00
Seth Vargo
af9177550a
Properly handle empty/nil values in Chef Solo config
2014-10-30 13:43:26 -04:00
Seth Vargo
7e71d72db8
Check for empty chef_server_url and validation_key_path
2014-10-30 13:43:25 -04:00
Seth Vargo
721edf70b9
Make Chef Zero lowercase in validation (conforms to other keys)
2014-10-30 13:43:25 -04:00
Seth Vargo
1169c80a72
Use require_relative for faster loading
...
require_relative is an order of magnitude faster on Windows
2014-10-30 13:43:25 -04:00
Teemu Matilainen
dec5dcdda3
provisioners/chef: Add `chef_zero` provisioner
...
Add Chef Zero provisioner using `local_mode` configuration for
chef-solo/chef-client.
2014-10-30 13:43:24 -04:00
Rob Kinyon
14b84a4a76
Added a --plugin-clean-sources parameter that will allow for
...
only those sources that are defined by the user to be used.
2014-10-28 21:53:41 -04:00
Fabian Ruff
8990e18e6d
fix copy and paste bug
2014-10-27 18:23:00 +01:00
Fabian Ruff
d33c7b4d7a
Add password to rdp_info hash
...
Any specific reason the password was omitted from the rdp_info hash?
Without the password in the rdp_info hash I see no way of figuring out the password in the rdp_client capability.
2014-10-27 18:21:02 +01:00
Adam Spiers
6af715b0db
silence warnings about unescaped '-' in re char class
...
Eliminate warnings like this:
vagrant/plugins/hosts/linux/cap/nfs.rb:74: warning: character class has '-' without escape: /^# VAGRANT-BEGIN:( 1000)? ([\.\/A-Za-z0-9-_]+?)$/
2014-10-25 15:38:13 +01:00
Tarrant
eeb11ec653
Merge branch 'master' of github.com:tarrant/vagrant
2014-10-24 13:54:16 -07:00
Tarrant
70fece7a99
Add support for DHCP on tinycore
2014-10-24 13:52:35 -07:00
Tarrant
ba994baa65
Revert "guests/tinycore: error if DHCP [GH-4699]"
...
This reverts commit 64139f2158
.
2014-10-24 13:52:06 -07:00
Mitchell Hashimoto
ea983e32c8
hosts/*: NFS prune regexp matches file paths [GH-3815]
2014-10-24 12:16:53 -07:00
Mitchell Hashimoto
64139f2158
guests/tinycore: error if DHCP [GH-4699]
2014-10-24 11:24:16 -07:00
Mitchell Hashimoto
5418e6b85e
guests: add remove_public_key to most guests
2014-10-24 10:05:01 -07:00
Mitchell Hashimoto
94b2a8a56b
communicators/ssh: insert random key, remove insecure key
2014-10-24 09:58:18 -07:00
Mitchell Hashimoto
37a4000722
providers/virtualbox: more descriptive error if empty version [GH-4657]
2014-10-24 09:20:08 -07:00
Mitchell Hashimoto
da91741b7c
provisioners/shell: fix typo
2014-10-23 22:49:26 -07:00
Mitchell Hashimoto
a7d3458abc
provisioners/shell: retry getting SSH info a few times [GH-3924]
2014-10-23 22:48:48 -07:00
Mitchell Hashimoto
cc01f01684
hosts/linux: don't use sudo to write NFS if writable [GH-2643]
2014-10-23 22:25:38 -07:00
Mitchell Hashimoto
6ea8dc8e20
core: cleaner output of what provisioner is running if named
2014-10-23 18:47:03 -07:00
Mitchell Hashimoto
97f9948fce
core: provisioners are defined differently now
2014-10-23 18:40:14 -07:00
Mitchell Hashimoto
aa981cf4ec
hosts/bsd: only use sudo if we can't write /etc/exports [GH-2643]
2014-10-23 17:43:58 -07:00
Mitchell Hashimoto
ad758bf69a
core: prefer providers in the Vagrantfile [GH-3812]
2014-10-23 15:32:54 -07:00
Mitchell Hashimoto
b656bf4ae5
providers/docker: build output [GH-3739]
2014-10-23 15:03:09 -07:00
Gilles Cornu
1e324093a5
provisioners/ansible: spare machine.ssh_info calls
...
As a result of #4670 and the safe decision to not memoize
machine.ssh_info (see 89a4a29d65
and
5036d16461
), it is preferable to store the
ssh_info hashes and avoid multiple function calls when generating the
ansible inventory.
2014-10-23 22:58:01 +02:00
Mitchell Hashimoto
f23c5ebc46
commands/plugin: list puts plugin namein machine readable output
...
[GH-4506]
2014-10-23 12:00:46 -07:00
Mitchell Hashimoto
06defb37c7
commands/up: if all machines autostart:false, start none [GH-4552]
2014-10-23 11:46:22 -07:00
Mitchell Hashimoto
37a04b4bfc
provisioners/puppet: use correct error class [GH-4520]
2014-10-23 10:46:11 -07:00
Mitchell Hashimoto
4ffaaf119e
providers/virtualbox: more hints when choosing interface [GH-4463]
2014-10-23 10:24:07 -07:00
Mitchell Hashimoto
9b9c24cb59
Merge pull request #4468 from SilverWyrda/arch-predictable-network-interface-names
...
guests/arch: Add support for predictable network interfaces names
2014-10-23 10:20:01 -07:00
Mitchell Hashimoto
26c468b5f9
Merge pull request #4469 from Gurpartap/tinycore-change_host_name-pr
...
change_host_name.rb for TinyCore Linux
2014-10-23 10:18:56 -07:00
Mitchell Hashimoto
d04ec704c1
update CHANGELOG
2014-10-23 10:12:27 -07:00
Mitchell Hashimoto
4b4255c6d1
Merge pull request #4492 from tboerger/feature/suse-fixes
...
SUSE naming and capability fixes
2014-10-23 10:11:28 -07:00
Mitchell Hashimoto
e30ba41104
Merge pull request #4499 from sprin/centos_7_nfs_client
...
Fix NFSClient plugin for Redhat / Centos 7 guests
2014-10-23 10:09:11 -07:00
Mitchell Hashimoto
4c0aa0d9cb
update CHANGELOG
2014-10-23 10:04:58 -07:00
Mitchell Hashimoto
fca6428ecd
Merge pull request #4518 from lunetics/master
...
guests/freebsd: allow NFS version param
2014-10-23 10:03:41 -07:00
Mitchell Hashimoto
f24af5dda4
Merge pull request #4527 from Asquera/bugfix/4465-host-not-added-to-etc-hosts
...
Fix #4465 update /etc/hosts on rhel 7 and derivatives (CentOS)
2014-10-23 09:57:12 -07:00
Mitchell Hashimoto
d211e1c1d2
Merge pull request #4534 from matgnt/master
...
hosts/windows: Don't mount all drives into the RDP session
2014-10-23 09:56:11 -07:00
Mitchell Hashimoto
50b0ea8173
Merge pull request #4535 from plu/master
...
guests/darwin: Set ComputerName and LocalHostName on darwin guests
2014-10-23 09:55:13 -07:00
Mitchell Hashimoto
3f01a99148
provisioners/shell: rename shell_args to powershell-args
2014-10-23 09:53:14 -07:00
Mitchell Hashimoto
f0a4e26d27
Merge pull request #4548 from ebelew/shellargs
...
Update powershell provisioning to fix #4547
2014-10-23 09:50:50 -07:00
Mitchell Hashimoto
35c9b59968
Merge pull request #4565 from dup2/patch-1
...
guests/ubuntu: A more reliable way to detect Ubuntu via lsb_release
2014-10-23 09:46:54 -07:00
Mitchell Hashimoto
f122ed756c
Merge pull request #4571 from jperville/docker-provider-allow-multiple-links-to-same-backend
...
providers/docker: allow multiple links to same backend (different aliases)
2014-10-23 09:45:14 -07:00
Mitchell Hashimoto
abb9e5478a
provisioners/docker: get GPG key via SSL [GH-4597]
2014-10-23 09:34:24 -07:00
Mitchell Hashimoto
29df3c733b
Merge pull request #4596 from miguel250/patch-1
...
Use HTTPS to download docker's gpg key.
2014-10-23 09:32:54 -07:00
Mitchell Hashimoto
a6c0989bc6
Revert "Merge pull request #4616 from crypt1d/master"
...
This reverts commit aec69c4627
, reversing
changes made to 88754d2904
.
2014-10-23 09:30:46 -07:00
Mitchell Hashimoto
aec69c4627
Merge pull request #4616 from crypt1d/master
...
Consider the host_ip value when handling port collisions
2014-10-23 09:26:31 -07:00
Mitchell Hashimoto
fb5aefe41e
Merge pull request #4619 from dlundgren/master
...
Don't update the NFS exports file [GH-4148]
2014-10-23 09:21:20 -07:00
Mitchell Hashimoto
bab9e979b7
Merge pull request #4621 from awusizok/fix/master/2905-static-solaris11-addresses
...
guests/solaris: Solving #2905 - Restarting Solaris 11 boxes with static ip addresses
2014-10-23 09:20:10 -07:00