f4d1d068f9
Merge branch 'master' into VB-linked-clone-support
2015-07-13 10:56:17 +02:00
d09e8e6f50
guests/redhat: Fixed the NFS detection on guest, not host [GH-5948]
2015-07-13 14:18:27 +08:00
13e2dbaf9d
Fix setting hostname in 12.04
...
Fixes #5934
2015-07-11 19:15:54 +01:00
27d7518636
Fix alignment of initializer
2015-07-11 10:40:17 -07:00
ccd7354665
Initialize the install_command salt config var
2015-07-11 10:31:19 -07:00
73d5718da3
guests/fedora: don't fail if nmcli doesn't exist on the guest
2015-07-11 16:14:11 +09:00
5f383b546c
Use sudo for read_ip_address capability
...
Fixes #4868
2015-07-10 13:25:11 -06:00
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
3e3037f313
Add a space before args
2015-07-10 10:49:21 -06:00
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
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
4b1847acf3
Use Chef Client for Chef Zero
...
Fixes GH-5619
2015-07-09 21:23:42 -06:00
40b94afeb5
Update command builder now that provisioning_path has moved to runtime
2015-07-09 17:46:39 -06:00
60330218fb
Merge pull request #5913 from mitchellh/sethvargo/windows_chef_paths
...
Use windows-specific Chef paths
2015-07-09 17:05:40 -06:00
e9bcf147f0
Prefix with guest_
2015-07-09 17:01:36 -06:00
0e039159a6
Calculate Chef paths at provision time
2015-07-09 16:55:55 -06:00
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
742d47c4cf
No longer need subprocess wrapping there :)
2015-07-09 16:06:03 -06:00
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
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
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
5fd3ab5bb0
Merge pull request #5706 from jim-minter/master
...
Remove docker0 from guest network interface enumeration
2015-07-09 14:31:00 -06:00
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
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
f1618f5ec8
providers/docker: don't remove image on reload for build cache
2015-07-09 14:23:26 -06:00
9bdefb5c59
Don't destroy built Docker image on reload
2015-07-09 16:15:56 -04:00
300b9c9109
provisioners/chef: don't check existing set, unique ID
...
[GH-5199]
2015-07-09 14:04:12 -06:00
d5458247c7
update to latest listen
2015-07-09 11:18:36 -06:00
9596b7a46c
synced_folders/rsync-auto: don't crash if rsync command fails [GH-4991]
2015-07-09 11:11:58 -06:00
d95dad9a79
synced_folders/rsync: command help [GH-5868]
2015-07-09 10:58:45 -06:00
964f340f09
synced_folders/nfs: verify_installed option [GH-5269]
2015-07-09 10:24:40 -06:00
31448d126b
synced_folders/rsync: can set rsync_path [GH-3966]
2015-07-09 10:02:38 -06:00
c1508cd893
kernel/v2: customizable sudo_command [GH-5573]
2015-07-09 09:30:47 -06:00
536ea0729b
providers/virtualbox: name for private network chooses right interface
...
[GH-5389]
2015-07-08 18:35:44 -06:00
45a5bc3bd9
kernel/v2: make provisioner name show up on invalid [GH-5902]
2015-07-08 17:50:36 -06:00
9dd87b289e
providers/docker: validate config after HandleBox [GH-5667]
2015-07-08 17:45:32 -06:00
be21604d45
providers/docker: style on custom Dockerfile
2015-07-08 16:07:57 -06:00
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
0b6938d8ab
core: don't prepare folders in disable ode
2015-07-08 15:43:42 -06:00
1c203405d2
providers/docker: fix crash if host VM file can't be foundJ:wq
...
gs
2015-07-08 12:31:24 -06:00
9dd5640324
provisioners/docker: for debian, chmod the var lib docker folder
2015-07-08 12:13:25 -06:00
606a8fdde2
providers/docker: validate create args is list [GH-4850]
2015-07-08 10:25:32 -06:00
855aa66ad9
providers/docker: better error on suspend
2015-07-08 10:18:43 -06:00
dbf0af2e3f
providers/docker: don't pull if image is built
2015-07-08 10:10:43 -06:00
c2cae80de5
providers/dock: pull image prior to starting
2015-07-08 10:09:15 -06:00
26fe5ac89f
guests/tinycore: more robust rsync install
2015-07-08 09:47:48 -06:00
0d561ddf94
guests/tinycore: fix rsync install on 64-bit b2d
2015-07-07 16:21:34 -06:00
72b3ccd64f
providers/docker: use new b2d box
2015-07-07 16:06:04 -06:00
dd69de1073
communicators/ssh: only try auth methods that are valid
2015-07-07 16:06:03 -06:00
839a2e6fa6
provisioners/ansible: show ansible-playbook only when the verbose option is enabled
...
Revert 1c884fa4e5``@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
9c7f666e48
provisioners/docker: support restart flag [GH-4477]
2015-07-07 12:17:24 -06:00
da67824a53
Adding run_service and minion/master ids for windows
2015-07-07 00:24:23 -06:00
33d4f4d2a9
push/local-exec: close temp script, fix inline [GH-5695]
2015-07-06 23:42:07 -06:00
0b9ec53f46
commands/rdp: support username param [GH-5460]
2015-07-06 23:07:22 -06:00
cd18eddb1c
providers/virtualbox: fix bug, make message clearer
2015-07-06 18:18:13 -06:00
71940c60ba
providers/virtualbox: error if uid mismatch
2015-07-06 18:13:59 -06:00
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
709f20b54f
Merge pull request #5651 from nspaeth/docker-download
...
Implement docker download method
2015-07-06 15:34:27 -06:00
4d4d2a4eec
Merge pull request #5731 from strzibny/rhel
...
Fix RHEL name and description
2015-07-06 15:31:26 -06:00
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
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
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
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
a0326751e6
Merge pull request #5847 from strzibny/atomic-guest
...
guest/atomic: Add Atomic guest support
2015-07-06 15:20:02 -06:00
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
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
f5e38a4a14
kernel/v2: not an error if synced folder guest path is empty [GH-4833]
2015-07-06 14:58:48 -06:00
6dffec4bf9
guests/solaris11: fix suexec inheritence [GH-5247]
2015-07-06 14:23:24 -06:00
2fc8d99f6d
provisioners/file: validate source relative to Vagrantfile path
...
[GH-5252]
2015-07-06 14:22:00 -06:00
1ac3d17773
bugfix: undefined local variable or method `dir'
...
resolves bug introduced in 74d22069d4
2015-07-06 11:39:07 -07:00
fec6ef11c8
provisioners/puppet: just quiet the NFS errors for Puppet [GH-5456]
2015-07-06 11:19:32 -06:00
d03b1f6930
push/atlas: ATLAS_TOKEN env var works [GH-5489]
2015-07-06 11:01:50 -06:00
e64cef9d31
provisioners/chef: fix crash if run list is somehow nil [GH-5545]
2015-07-05 17:30:29 -07:00
262b50bc02
guests/linux: fix exception when printf is empty [GH-5846]
2015-07-05 17:14:48 -07:00
67c14c4889
guests/openbsd: add newline after insert_public_key [GH-5881]
2015-07-05 17:10:10 -07:00
36fa04fd1e
providers/virtualbox: catch subprocess launch error [GH-1483]
2015-07-05 17:01:06 -07:00
eab702da83
Adding config to set version to install
2015-07-04 01:25:31 -06:00
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
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
a151f7172a
Remove Fedora nfs cap
2015-06-30 10:23:15 +02:00
c4733a02d4
Rewrite Red Hat nfs caps based on systemd checks
2015-06-30 10:21:58 +02:00
94549ab755
Need to do update before installing linux-image-extra kernel in case system is outdated.
2015-06-24 14:56:28 +02:00
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
ca8923835a
Use the extended password parameter, more compatible
2015-06-08 04:13:23 +01:00
e6daf2f172
fix pscommand error messaging
2015-06-05 22:24:05 -07:00
ac9b0b7978
prefer ipv4 host address over ipv6 for smb synced folders
2015-06-05 06:19:58 -07:00
740877065a
marshall back command output when passing a command to ps
2015-06-05 05:07:14 -07:00
cf6d4ef5a1
clean up command encoding
2015-06-05 05:07:13 -07:00
47e57a7cd9
fix relative path
2015-06-05 05:07:12 -07:00
1cd1033093
fixes from @sethvargo comments.
2015-06-05 05:07:12 -07:00
c60a020096
adds a ps command to vagrant that drops the user into a remote powershell shell
2015-06-05 05:07:11 -07:00
9d63ca4dd2
Acquire lock to prevent concurrent creation of master VM for the same box.
2015-06-03 13:31:43 +02:00
b92d4b21a1
Add UI::Interface#color?
2015-06-01 11:49:09 -04:00
72e63767ac
Salt Provisioner: refactor custom install_type option to add install_command instead
2015-06-01 10:37:41 -05:00
0b24866537
merged in master and resolved conflict in Salt provisioner docs
2015-06-01 10:07:28 -05:00
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
f7894d9c8c
provisioners/ansible: fix broken colorized output
...
After #5532 (e745436df3fix #5531 ) is now covered by a unit
test.
//cc @marsam, @sethvargo
2015-06-01 08:36:09 +02:00
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
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
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
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
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
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
f5c77765fa
Merge pull request #5437 from Jamezz/master
...
Fix issue #4152 : Salt minion bootstrapping
2015-05-31 20:08:32 -07:00
19f3c10777
Always return the version
2015-05-31 19:02:24 -07:00
30dda77454
Remove unneeded tap on nfs_client cap for Fedora
2015-05-31 19:02:23 -07:00
3fcd3d691a
Fix syntax errors and style on Fedora flavor cap
2015-05-31 19:02:23 -07:00
efd7b459dd
Add more capabilities for Fedora guests
2015-05-31 19:02:23 -07:00
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
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
b90807648b
Style fixes
2015-05-31 10:19:03 -07:00
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
26e3994319
Add option to enable trusted HTTP redirects
2015-05-31 09:34:02 -07:00
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
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
7f716f4b63
Added synced_folder_args to puppet provisioner
2015-05-30 21:26:05 -07:00
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
042928db9f
Merge pull request #5601 from benh57/environments_wip
...
Puppet 4 and Puppet environments support
2015-05-30 21:04:48 -07:00
50c0c487fb
Style cleanup for new name option
2015-05-30 20:57:49 -07:00
afc02ed681
Merge pull request #5607 from purpleidea/feat/named-shell
...
Add :name attribute to shell provisioner.
2015-05-30 20:54:34 -07:00
bf45aa6233
Merge pull request #4726 from databus23/patch-3
...
Add password to rdp_info hash
2015-05-30 12:18:29 -07:00
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
baaca21371
Merge pull request #5709 from linyows/fix-network-manager
...
Reload iface connection by NetworkManager
2015-05-30 12:08:15 -07:00
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
9dddcdb8de
Merge pull request #5691 from bergman/list-of-nics-to-bridge-to
2015-05-30 12:02:17 -07:00
08f240668b
Minor cleanup
2015-05-30 12:02:10 -07:00
464e3f5bec
Merge pull request #5749 from jeremyplichta/patch-1
...
change to https in sources.list.d
2015-05-30 11:59:05 -07:00
801d590204
Merge pull request #5730 from strzibny/fedora-releases
...
Recognize new Fedora releases
2015-05-30 11:58:18 -07:00
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
56da192878
Merge pull request #5623 from otagi/tinycore-changehostname
...
TinyCore change_host_name capability
2015-05-30 11:52:54 -07:00
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
388c2f2383
Merge pull request #5539 from vvchik/vlanid
...
HyperV provider: VlanID configuration possibility
2015-05-30 11:46:43 -07:00
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
3528af2db9
ENH: simpler masterless configuration.
2015-05-30 11:42:15 -07:00
0b85e04399
Minor style fixes for salt config_dir
2015-05-30 11:39:24 -07:00
74d22069d4
BUG: naive attempt at fixing #2970 .
2015-05-30 11:39:23 -07:00
a59247d4e5
Trailing comma
2015-05-30 11:01:32 -07:00
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
67cde0d9b9
Use hostnamectl to set the hostname on Ubuntu Vivid 15.
2015-05-25 16:06:51 -04:00
1c04934d89
Mounting to paths where user has no write permissions (e.g. /)
2015-05-25 15:35:06 +02:00
09eec472f6
Mounting as regular user instead of root
2015-05-24 15:11:34 +02:00
b387f0e15d
Capability to mount smb shares in darwin guests
2015-05-24 12:39:28 +02:00
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
c399f075d5
darwin/cap/change_host_name: Fixed invalid argument LocalHostName
2015-05-21 18:48:39 +03:00
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
c1a26a66d1
Fix RHEL name and description
2015-05-19 12:58:19 +02:00
bd2f2fc3a0
Add Atomic guest support
2015-05-19 12:55:44 +02:00
b85248cb97
Recognize new Fedora releases
2015-05-19 10:44:25 +02:00
421fab17a2
reload connection instead of restart
2015-05-14 12:53:23 +09:00
c1c39beaab
restart NetworkManager and network for CentOS 7.1
2015-05-13 18:07:32 +09:00
8e0746843d
Remove docker0 from guest network interface enumeration
2015-05-12 21:18:31 +01:00
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
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
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
9233e22974
Use powershell syntax for Chef provisioner when using windows
2015-05-02 16:21:32 +01:00
a6f300f3e9
Implement download method
...
Use the same method as upload, in a different order
2015-04-28 15:35:39 -05:00
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
9bbfbef977
Be a bit more robust when parsing environment.conf
2015-04-27 23:09:07 -07:00
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
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
0b588e3656
Remove useless line
...
/usr/bin/sethostname will change /etc/hostname, useless to do it twice
2015-04-21 21:04:40 +02:00
a9b8139755
Added change_host_name capability for tinycore.
2015-04-21 20:48:34 +02:00
90bb760b3b
Added tests
...
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-04-20 14:56:26 -07:00
21db4470a0
Add Guest support for VMware Photon.
...
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-04-20 10:13:21 -07:00
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
602227ca7d
Remove debug spam from development.
2015-04-16 00:50:53 -07:00
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
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
ffcb58bcd9
When using environments, allow specifying the 'main manifest' using manifest_path and manifest_file.
2015-04-12 12:31:31 -07:00
0efb9a3932
Fix resolution of puppet path for <4.0
2015-04-12 12:29:50 -07:00
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
c8f300e5f5
Correct environment path option to puppet apply.
2015-04-12 01:43:19 -07:00
c701bab253
Properly handle various combinations of Puppet options being specified.
2015-04-12 01:26:41 -07:00
cff7c52716
Use localized error message. Update strings for puppet provisioner errors.
2015-04-12 01:25:40 -07:00
7a4e7929f8
Don't parse env metadata until provisioning time. TBD: make it functional
2015-04-12 01:18:49 -07:00
3ee47acb42
Remove debug output
2015-04-12 01:18:12 -07:00
e2c68fc12d
Correct environment path config name.
2015-04-11 23:48:18 -07:00
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
cf847e0410
Merge branch 'master' into environments_wip
...
Conflicts:
Vagrantfile
vagrant.gemspec
2015-04-11 13:33:32 -07:00
e8843b8648
Merge branch 'master' of https://github.com/mitchellh/vagrant
2015-04-11 13:03:18 -07:00
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
415837c544
moved function to platform utils, added unit test as per @sethvargo
2015-04-06 16:51:55 -04:00
13d4899d16
Cleanup style
2015-04-02 10:11:41 -04:00
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
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
9a0aab4bd7
Improved behavior for case if vlan_id is not set
2015-03-30 10:17:29 -06:00
9e23d16d9c
merged vlan_id changes for hyperv by tomassrnka
2015-03-30 08:37:29 -06:00
fd557592d4
only set EFI secure boot for gen 2 machines in hyperv provider
2015-03-30 20:00:16 +07:00
e745436df3
provisioners/ansible: disable color if Vagrant has no color [GH-5531]
2015-03-28 19:05:54 -05:00
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
7d17574a76
changing windows/virtualbox shared path names to UNC format to allow > 256 characters
2015-03-18 15:29:43 -04:00
be81f09a60
Supporting a named Dockerfile for Docker 1.5.0
2015-03-13 17:30:42 -07:00
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
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
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
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
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
4f44ae5379
providers/virtualbox: interpolation added to error [GH-5308]
2015-02-24 10:48:59 -08:00
713be4c5b9
provisioners/chef: actually use command -v
2015-02-24 10:12:25 -08:00
c1e2d36090
provisioners/chef: use command -v to check for binary [GH-5167]
2015-02-24 10:11:05 -08:00
808a86a918
Merge pull request #5175 from hdeheer/patch-1
...
synced/folders/rsync Add 'IdentitiesOnly=yes'
2015-02-24 10:06:24 -08:00
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
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
4e32155b95
Merge pull request #5261 from blairham/revert-4693-master
...
Revert "Rename Windows guest without reboot"
2015-02-24 09:59:53 -08:00
eca5ab0a4d
Merge pull request #5277 from Keeguon/fedora21
...
detect fedora 21
2015-02-24 09:58:20 -08:00
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
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
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
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
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
d399bdae8f
Merge pull request #5320 from epicagency/master
...
providers/virtualbox: support Regexp usage for bridge configuration
2015-02-24 09:43:36 -08:00
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
7900fc65fc
Merge pull request #5349 from agreenbhm/master
...
hosts/windows: update host_info.ps1
2015-02-24 09:26:27 -08:00
c01c4bf41e
remove extra spaces on plugin.rb ;).
2015-02-20 20:49:50 +01:00
1eedc2b5f1
Added specific support for Debian 8 (aka jessie) to permit proper vagrant halt execution
2015-02-20 20:15:05 +01:00
a1f6bfb1f2
Update host_info.ps1
2015-02-18 11:53:03 -05:00
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
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
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
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
74ffcb27d6
Add 'enable_reporting' attribute for chef provisioner
2015-02-14 22:28:32 +01:00
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
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
887f94260e
Support Regexp usage for bridge configuration
2015-02-11 11:07:03 +01:00
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
d6e91483a6
Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
...
Conflicts:
vagrant.gemspec
2015-02-09 11:10:23 -05:00
02c0bfafc6
Add Scientific Linux to RHEL 7 flavors.
2015-02-08 02:56:44 +02:00
2e659bf12c
Update host_machine_build_dir.rb
2015-02-07 20:33:55 -03:00
a6361a750c
Copy linux support for insert_public_key and remove_public_key to solaris11.
2015-02-04 16:58:17 -06:00
7d25a687ca
Add tests for sending metadata
2015-02-04 11:45:02 -05:00
257ff57772
Remove message for now
2015-02-03 21:06:51 -05:00
82b24e9a8f
Pass in a message to the command as well
2015-02-03 19:20:27 -05:00
d29a474fbb
Cleanup that syntax
2015-02-03 19:20:12 -05:00
edbc3e74d4
Pass metadata to push command
2015-02-03 19:19:51 -05:00
52d0df3296
Add --message option to `vagrant push`
2015-02-03 19:19:08 -05:00
b776fe74b8
detect fedora 21
2015-02-03 10:23:35 +01:00
7784ee2d09
Revert "Rename Windows guest without reboot"
2015-01-28 20:00:24 -05:00
39882957ee
Add retry_delay setting to speed up test
2015-01-28 13:41:07 -05:00
5d5e13bc0f
Change authorization error tests to match WinRM 1.3
2015-01-28 13:41:07 -05:00
56a6c85e7d
Windows rsync needs to create folders before syncing
2015-01-28 13:07:36 -05:00
c37c12526a
Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling
...
Conflicts:
vagrant.gemspec
2015-01-28 10:44:47 -05:00
6378deacd6
Merge pull request #5225 from mitchellh/winrm-fs-dependency
...
Use winrm-fs for file uploads
2015-01-26 09:55:31 -08:00
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
a317a4d50d
Ensure allowed_synced_folder_types is a list of symbols
2015-01-20 16:18:05 -05:00
d781dce8f8
Filter synced folders by allowed_synced_folder_types
2015-01-20 16:18:05 -05:00
29845e926c
Merge branch 'master' into winrm_error_handling
2015-01-20 16:16:48 -05:00
edc867986b
Merge branch 'master' into winrm_error_handling
2015-01-20 16:07:00 -05:00
e07f229f6e
Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
2015-01-20 16:00:20 -05:00
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
0cfe5ebfa6
Merge pull request #5222 from simonjbeaumont/fix-regex
...
Allow colon in NFS ID regex
2015-01-20 09:58:31 -05:00
8519e174f0
Merge pull request #5220 from voxik/fix-permissions
...
Remove unneeded executable permissions.
2015-01-20 09:53:48 -05:00
3deed353ae
Allow colon in NFS ID regex
...
Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
2015-01-20 14:11:42 +00:00
7d3b5352da
Remove unneeded executable permissions.
2015-01-20 11:53:30 +01:00
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
21e2f33fb0
Fix for: [hyperv]: VM import process does not respect Secure Boot option from image #5209
2015-01-17 21:31:37 +01:00
87195f8336
use :bridge instead of network_name to align with site docs
2015-01-17 11:39:32 -08:00
0b6e65380a
select a switch ased on a network_name
2015-01-17 01:06:56 -08:00
a9ac168b19
Added possibility to configure memory, cpus count, and vmname in vagrantfile
2015-01-14 16:59:01 +02:00
75de0e3dd7
Add insert/remove public key guest capability for solaris (identical to linux)
2015-01-13 21:45:06 -05:00
17a0d08040
Add chef_install(ed?) guest capability for omnios
2015-01-13 17:45:01 -05:00
cdd5d54208
provisioners/ansible: fix a typo in a comment
...
[ci skip]
2015-01-13 18:52:47 +01:00
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
28e0646dc2
Fix typo error in CHANGELOG
...
Close #4860
[ci skip]
2015-01-12 10:59:07 +01:00
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
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
114858c7d2
Verify the token is valid when saving
2015-01-09 13:24:53 -05:00
253f0637e5
Add a -t command for setting the login token
2015-01-08 17:16:21 -05:00
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
39233e802f
Validate pushes in the global config
2015-01-07 15:51:20 -05:00
6b51526ba2
Validate push configuration in the environment
2015-01-07 11:43:26 -05:00
e828719c2f
Add logging to vagrant-login
2015-01-07 11:43:14 -05:00
95e1c19f22
provisioners/puppet: fix exception with module paths [GH-5123]
2015-01-06 22:50:24 -08:00
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
661657c63f
provisioners/chef: fix failing test
2015-01-06 10:57:25 -08:00
5b4b387f04
provisioners/chef: fix failing tests
2015-01-06 10:56:28 -08:00
de6b55d007
provisioners/puppet: use predictable synced folders
2015-01-06 10:48:31 -08:00
155516fb6c
provisioners/chef: use synced folder cache instead of counter
2015-01-06 10:31:13 -08:00
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
7609932a6f
Do not use keyword arguments for string keys
2015-01-05 18:58:57 -05:00
d2874064f4
Use .key? instead of .has_key?
2015-01-05 18:29:01 -05:00
5e0f91f592
ENV returns nil, not empty strings
2015-01-05 16:04:00 -05:00
2bd22c9663
Turn on Atlas debug logging if Vagrant is logging
2015-01-05 15:51:19 -05:00
dd62d3c5f1
Merge branch 'master' into GH4201-ShowRSyncOutput
2015-01-05 14:42:08 -06:00
d2e1500c74
Review comments applied. Removed changelog. Changed showoutput to verbose.
2015-01-05 14:36:00 -06:00
c4502737c8
Revert "Symbolize and stringify keys in options hash"
...
This reverts commit 1699c92eec
2015-01-05 12:35:31 -08:00
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
d482e0ca10
Merge pull request #5085 from evverx/provision-with
...
Enable provision with --provision-with flag
2015-01-05 11:45:10 -08:00
4849ec8f7c
guests/solaris: merge config properly [GH-5092]
2015-01-05 09:52:19 -08:00
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
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
1699c92eec
Symbolize and stringify keys in options hash
2015-01-05 10:48:39 -05:00
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
f11ec8ff1a
Make parent directories when uploading to FTP
2015-01-04 18:06:51 -05:00
6a3d99a9a2
Output to the UI when uploading via FTP
2015-01-04 18:06:32 -05:00
50c1c0756e
Expand file paths relative to the root_path
2015-01-04 18:06:22 -05:00
fd3c1c6ebb
Add a logger when uploading to FTP
2015-01-04 18:06:05 -05:00
e330875303
Exclude certain directories by default
2015-01-04 18:05:46 -05:00
e7391359e8
Remove duplicate #parse_host method
2015-01-04 18:05:17 -05:00
944853ab47
Use 21 for the default port
2015-01-04 16:24:26 -05:00
2620042c26
Fix catching "Start-VM" exceptions on Hyper-V during starting up VM
2015-01-04 00:05:50 +01:00
084d2c06de
enable symlinks before adding shared folder
2015-01-01 16:00:17 -05:00
9aa20d5d6b
Added ability to run salt orchestrations to salt provisioner
2014-12-31 10:31:35 -08:00
43bb715c00
Enable provision with --provision-with flag
2014-12-30 06:10:52 +03:00
97d5a6ebfc
Log chef-zero instead of chef-solo
2014-12-28 12:52:54 -05:00
1cfc5acea3
Update Chef plugin description
2014-12-24 03:53:29 +03:00
55a90445cd
Fix new-style Network Device Naming on CentOS7+VMwarefusion
2014-12-21 16:25:11 +09:00
e828927cee
providers/virtualbox: Add 'post-comm' to the list of valid events
2014-12-21 01:09:55 +03:00
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
f2b494c2cc
don't forget to pass the `installer_download_path` from the config!
2014-12-17 00:48:34 +01:00
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
d7bd65b4e2
extend the omnibus command builder with an additional download_path parameter
2014-12-16 23:29:47 +01:00
9e7f705bad
extend the Chef provisioner base config object with an 'installer_download_path' property
2014-12-16 22:40:19 +01:00
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
954289beb6
Use new Chef Omnibus URL
2014-12-16 12:16:08 -05:00
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
185740163c
Don't reorder config in /etc/network/interfaces
2014-12-15 19:21:22 +00:00
bce0d1acc9
Pushes are strings
2014-12-15 01:29:58 -05:00
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
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
c0d4b39eea
Force opts to be options
...
cb6f3e5Fixes #4960
2014-12-14 23:46:39 -05:00
214a79e057
Pushes are hashed by name, not strategy.
...
@mitchellh this is a partial revert of 84ae22e84ae22e
2014-12-14 23:32:32 -05:00
9d1834a3c9
Fix line breaks
2014-12-13 21:08:31 +01:00
fdd7bc3ffd
commands/login: append access token to vagrantcloud => atlas URLs
2014-12-12 14:53:05 -08:00
84ae22e976
kernel/v2: fix push strategy config lookup
2014-12-12 01:36:39 -08:00
669c9fc013
commands/push: push strategy should be string
2014-12-12 01:27:22 -08:00
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
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
6596f7f29d
Merge pull request #4937 from mitchellh/sethvargo/error_format
...
Use the new Rails error format
2014-12-11 16:54:45 -08:00
3e8fdc0ca4
WinRM SSL support
2014-12-11 15:07:34 -05:00
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
234adaae63
WinRM SSL support
2014-12-11 14:09:17 -05:00
b5a9477405
Fix default forwarded ports
2014-12-11 13:39:24 -05:00
e7e50d39d9
Fix tests - all pass but auth retry test is extremely slow
2014-12-11 13:23:40 -05:00
24de8a1fb7
Just use ready?
2014-12-11 13:22:39 -05:00
ba7b964b1e
Better error handling for WinRM (using winrm v1.3.0.dev.2)
2014-12-11 13:22:39 -05:00
24f919c4d3
Fix accessors used by in communicator.rb
2014-12-11 13:22:39 -05:00
62ddd92768
Only forward one port for winrm
2014-12-11 13:22:39 -05:00
2caaf82ae0
Change default transport back to :plaintext, for backwards compatibility
2014-12-11 13:21:58 -05:00
02f4adc895
Fix broken variable references
2014-12-11 13:21:58 -05:00
072bb26a30
Change @ssl to @transport
2014-12-11 13:21:58 -05:00
b3480049ad
DRY the Shell: Don't duplicate the Config, especially since there were differing default values
2014-12-11 13:21:58 -05:00
1beb221bf3
Rename no_ssl_peer_verification to ssl_peer_verification, and make it configurable
2014-12-11 13:21:58 -05:00
243cc5dc37
config.rb: set default port based on @ssl
2014-12-11 13:20:22 -05:00
52d8fddf38
shell.rb: fix precedence
2014-12-11 13:20:22 -05:00
2f52a9c15c
Add winrmssl port forward (port 5986)
2014-12-11 13:20:22 -05:00
4455d2401b
Add ssl option to winrm config.rb
2014-12-11 13:19:09 -05:00
a99d32f60a
Add WinRM over SSL support
2014-12-11 13:19:09 -05:00
9a575a79ec
Use the new Rails error format
2014-12-11 01:21:46 -08:00
0506e17778
Update Atlas Push to use new vagrant-login API
2014-12-10 15:11:04 -08:00
7d6a6cd263
Read the ATLAS_TOKEN in vagrant-login
2014-12-10 15:08:43 -08:00
Manuel Pöter
Yang Sheng Han
aidanhs
William Kral
Satoshi Matsumoto
Seth Vargo
Gilles Cornu
Luis Pabón
Nicholas Randon
Mitchell Hashimoto
Mitchell Hashimoto
Adrian Guenter
Pat O'Shea
Jeff Quast
Marc Abramowitz
Dan Williams
Josef Stribny
arthurvanduynhoven
Shawn Neal
Francesco
Matt Wrock
Tim O'Guin
William Durand
langdon
Adam Spiers
Dmitry Moskalchuk
John Cooper
David Cournapeau
Justin Filip
alh84001
Jeremy Plichta
Mikhail Zholobov
linyows
Jim Minter
Benjamin Staneck
Joakim Bergman
Taliesin Sisson
Nathan
Ben Hines
Paul Krohn
Aneesh Agrawal
bmx0r
Tiago Mendes-Costa
Fabio Rapposelli
James Shubin
Aaron Quint
Brandon Matthews
Jean-Francois Bibeau
wucheng
Jeff Johnson
Volodymyr Babchynskyy
ssugar
Mario Rodas
Michael Adam
Adam Duro
Ben Jansen
Paul Hinze
Jamezz
gpkfr
agreenbhm
Max Lincoln
Michael Lopez
Timothy Sutton
Frank Baalbergen
Hugues Lismonde
Jimmi Dyson
Schneider Werner-Walter
cubetto
Christopher Chan-Nui
Félix Bellanger
Blair Hamilton
Richard Guin
Si Beaumont
Vít Ondruch
Clay Allsopp
Tomas Srnka
Clinton Wolfe
Hubert
Dan Carley
Chad Maloney
William Kolean
Andrew Mains
Evgeny Vereshchagin
Masahiro Ono
Mikhail Zholobov
Torben Knerr
Barry Kelly
Douézan-Grard Guillaume
Peter Ericson