f333b00f91
Merge pull request #3051 from mattes/patch-1
...
provisioners/docker: set param -name automatically (docker run)
2014-03-04 07:27:19 -08:00
5db58d6a33
commands/plugin: list notes system gems
2014-03-03 14:57:42 -08:00
8f76d5e2cd
added as ``args << ``
2014-03-03 16:30:42 +01:00
f6db54b2dc
Set param -name automatically (docker run)
...
``-name`` ist needed for linking containers, i.e. see http://docs.docker.io/en/latest/use/working_with_links_names/#working-with-links-names
2014-03-03 14:20:33 +01:00
179a9244df
Merge pull request #3043 from mitchellh/f-hyperv
...
Hyper-V and SMB
2014-02-28 21:37:05 +01:00
9120339dc7
providers/hyperv: set the hostname
2014-02-28 18:58:41 +01:00
cf8bfb2347
Ansible: Refactor handling of SSH vars/attributes
...
Avoid repetitions by using (sometimes lazy loaded) instance attributes
2014-02-28 09:07:52 +01:00
db490c5da5
Ansible: force 'ssh' connection only when needed
...
Remain in 'smart' mode, unless Multiple SSH identities or SSH-Forwarding
are in use.
2014-02-28 09:07:51 +01:00
9480edf05a
Ansible: Support SSH-Forwarding
...
Credits: Problem was originally reported in
dba02f3526
2014-02-28 09:07:51 +01:00
ca1e30d405
Ansible: Support multiple private keys
...
Note that this feature requires to force `--connection=ssh`. This is not
a big deal as `paramiko` mode is deprecated and in most cases `smart`
mode enables `ssh` mode.
2014-02-28 09:07:51 +01:00
a62d28fd7f
provisioners/ansible: remove an unused variable
...
Sorry, I missed that point in GH-2991 review.
[ci skip]
2014-02-28 09:00:05 +01:00
a1b29ca82b
Merge pull request #2991 from gildegoma/review-pr2926
...
provisioner/ansible: Ansible single inventory file
2014-02-27 11:30:12 -08:00
1724d499dc
synced_folders/smb: higher priority than things like NFS and rsync
2014-02-27 08:13:39 -08:00
729f0f5db8
providrs/hyperv: ask for the vswitch to use
2014-02-27 08:13:18 -08:00
3ddc63c88f
providers/hyperv: add script to read switches
2014-02-27 08:13:17 -08:00
da58f7bdc0
providers/hyperv: remove bad reference to file
2014-02-27 08:13:16 -08:00
bdcb92ed07
providers/hyperv: disable parallelism
2014-02-27 08:13:15 -08:00
39bf9db651
providers/hyperv: remove unused config
2014-02-27 08:13:15 -08:00
d1bdfe492b
providers/hyperv: style
2014-02-27 08:13:14 -08:00
af4bc18c14
providers/hyperv: use IsState and Message built-ins everywhere
2014-02-27 08:13:13 -08:00
e93038fd0e
providers/hyperv: suspend/resume
2014-02-27 08:13:11 -08:00
ef71729c24
providers/hyperv: remove nonexistent action
2014-02-27 08:13:10 -08:00
760f3d9b7b
providers/hyperv: that synced folder stuff can go
2014-02-27 08:13:09 -08:00
41bc86c490
providers/hyperv: clean up provider since we moved out SMB
2014-02-27 08:13:08 -08:00
dd6f1083b0
synced_folders/smb: test for admin privileges
2014-02-27 08:13:07 -08:00
a50421c54c
synced_folders/smb: raise error if not windows
2014-02-27 08:13:06 -08:00
0fe4a4af26
synced_folders/smb: basically working
2014-02-27 08:13:05 -08:00
31abc3f4a3
providers/hyperv: fix file format to unix
2014-02-27 08:13:04 -08:00
ea871ec9ef
providers/hyperv: change wording to look a bit better
2014-02-27 08:13:03 -08:00
4c810a879a
providers/hyperv: clone the disk
2014-02-27 08:13:02 -08:00
d8e4482f2c
providers/hyperv: enable provisioning
2014-02-27 08:13:01 -08:00
d4ec3b5dfc
providers/hyperv: reset machine ID if machine deleted outside
2014-02-27 08:13:00 -08:00
faf906c057
providers/hyperv: wait for communicator on boot
2014-02-27 08:12:59 -08:00
9fa4549105
providers/hyperv: remove unused var
2014-02-27 08:12:58 -08:00
5d19285774
providers/hyperv: wait for IP on boot
2014-02-27 08:12:57 -08:00
64abd95c6f
providers/hyperv: use HandleBox middleware
2014-02-27 08:12:57 -08:00
27688a183b
providers/hyperv: destroy
2014-02-27 08:12:56 -08:00
7c0948c81d
providers/hyperv: clean up status script
2014-02-27 08:12:55 -08:00
88247797d4
providers/hyperv: more cleanup
2014-02-27 08:12:54 -08:00
fe93b0d2a5
providers/hyperv: more checks on machine import
2014-02-27 08:12:53 -08:00
784a5b2e32
providers/hyperv: all sorts of tests to verify Windows/admins
2014-02-27 08:12:51 -08:00
ab4390eb67
providers/hyperv: clean up driver error handling quite a bit
2014-02-27 08:12:51 -08:00
fb7dd73d95
providers/hyperv: better errors
2014-02-27 08:12:49 -08:00
a1958ee12f
providers/hyperv: shuffle things around
2014-02-27 08:12:48 -08:00
3d8971b15f
providers/hyper-v: cleanup
2014-02-27 08:12:47 -08:00
ca24d60d8f
providers/hyperv: initial commit
...
Initial work done by MS Open Tech
2014-02-27 08:12:46 -08:00
6b17783688
synced_folders/nfs: unavailable on Windows
2014-02-27 08:11:50 -08:00
c877fc27a7
communicators/ssh: call ready? when waiting
...
This lets things like the SSH key go in
2014-02-26 11:35:41 -08:00
d14f3e0a56
hosts/bsd: make directories unique when exporting
2014-02-26 08:04:21 -08:00
12c740898c
provisioners/puppet: append module path (default) [GH-2677]
2014-02-24 08:09:24 -08:00
32c45aa70b
Revert "Merge pull request #2677 from purpleidea/fix_puppet_apply"
...
This reverts commit 9ac4ec85dd8dbad22d72
2014-02-24 08:07:57 -08:00
6c5179602c
provisioners/salt: error if minion_config missing [GH-2893]
2014-02-24 07:58:12 -08:00
1cd2fe56a0
ansible: generate inventory in .vagrant/...
2014-02-24 16:52:38 +01:00
7abcea35b8
hosts/linux: escape regular expression for prune NFS exports [GH-2934]
2014-02-24 07:51:06 -08:00
67a0d3d5f1
communicators/ssh: rescue/show correct error messages
2014-02-23 22:31:37 -08:00
3324756e12
providers/virtualbox: don't log in trap context
2014-02-23 22:09:15 -08:00
a667893cbf
provisioners/shell: error if invalid encoding [GH-3000]
2014-02-23 21:50:53 -08:00
5ebe007ddc
Merge pull request #3005 from ajw0100/fix-salt-options-error
...
provisioners/salt: Fix "options are only allowed before install arguments" error.
2014-02-23 21:25:42 -08:00
7b30e557cd
hosts/bsd: sort NFS exports to avoid false validation errors [GH-2927]
...
With a synced folder configuration like so:
synced_folder ".", "/vagrant", :nfs => true
synced_folder "#{ENV['HOME']}/mirror", "/mirror", :nfs => true
synced_folder ENV['HOME'], "/home/#{ENV['USER']}", :nfs => true
on OSX, vagrant writes two overlapping exports to /etc/exports
which then fail the export check.
Iterating through the list of folders lexically builds a correct, single
exports entry.
Signed-off-by: Teemu Matilainen <teemu.matilainen@iki.fi>
2014-02-21 23:43:11 -03:00
7d90191212
provisioners/chef: DRY up `environment` and `node_name` configuration
2014-02-21 23:28:46 -03:00
24f7d7b9eb
Merge pull request #2975 from shanegibbs/chef-solo-role-path
...
Add support for multiple role paths in chef-solo >= 11.8.0
2014-02-21 23:58:10 -02:00
9f0efc19a9
Fix "options are only allowed before install arguments" error.
...
This reverts feb748f4887cd7077467
2014-02-19 20:24:05 -08:00
807c879ac8
Merge pull request #2845 from tmatilai/chef_data_bag_secret
...
provisioners/chef: DRY and unify encrypted data bag secret handling
2014-02-19 00:54:57 -02:00
75dcc828ad
kernel/v2: fix error where options could be not hash
2014-02-18 10:41:14 -08:00
eea9c07029
provisioners/chef: set `encrypted_data_bag_secret` to `nil` if it's not uploaded
...
/cc @shanegibbs
Fixes #2984
2014-02-16 18:14:56 -03:00
709f3f4e6f
provisioners/ansible: Change --limit behaviours
...
- The implicit default limit is always set
- ansible.limit as an empty string won't disable the default limit, but
will be passed as "--limit=" argument and ansible-playbook will return
an error (provided host list is empty)
2014-02-16 11:39:15 +01:00
c2663f5d30
provisioners/ansible: Fix Group Management
...
- Support arbitrary depth of "groups of groups of ... groups"
- Skip ':vars' suffix, but allow group names with ':' (yes, Ansible
accepts this character)
- Like for groups of machines, groups of groups can result "empty", but
it is not an issue for Ansible. Recursive filter on the group tree is
a bit hard to implement, and don't brind real added value at Vagrant
level.
2014-02-16 11:20:00 +01:00
ad34d474bc
provisioners/chef: DRY and unify encrypted data bag secret handling
...
Pull up encrypted data bag secret management into the base classes, thus
also unifying the functionality.
Especially this complements the issues:
* Upload the secret to provisioning path also with chef-solo [GH-1246]
* Delete the secret also with chef-client [GH-2712]
* Remove the secret before uploading also with chef-client [GH-1111]
2014-02-15 22:46:48 -03:00
85d2f24607
more robust coreos checking
2014-02-15 15:50:11 +11:00
2d01691e0a
detect latest version of coreos
2014-02-15 15:03:06 +11:00
8c9fde41e9
provisioners/shell: clean up fixnum handling
2014-02-14 12:43:27 -08:00
509e29043a
Added handling of fixnum values for shell provisioner options both as the value
...
of `args` itself and as an element inside of an `args` array. Added validation
around passing in arrays for arguments. Just knowing that it is an array is not
enough, because arrays can contain any other type.
2014-02-14 11:47:36 -08:00
5600bd1067
Add support for multiple role paths in chef-solo
2014-02-14 21:48:18 +13:00
d0cd2464b2
providers/virtualbox: only clear forwarded ports if there are any
2014-02-13 21:04:56 -08:00
2fe2fe79ed
communicators/ssh: properly allow errors through while waiting
2014-02-13 21:04:41 -08:00
ed5e544e63
communicators/ssh: more verbose output about waiting for SSH
2014-02-13 20:59:26 -08:00
14b27ae215
communicators/ssh: cache ssh_info
...
This lowers the number of subprocesses with VirtualBox quite a bit.
2014-02-13 20:34:51 -08:00
b1bed68bed
providers/virtualbox: cap to read forwarded ports
2014-02-13 16:34:34 -08:00
e909b91bfd
guests/linux: public key insertion is more robust
...
contents can have newlines (or not)
2014-02-12 22:11:33 -08:00
12b2572687
kernel/v2: capture error if provider config is bad [GH-2959]
2014-02-11 11:55:04 -08:00
dd9dd5127c
Merge pull request #2948 from gnawhleinad/master
...
command/*: clean up usage
2014-02-10 09:02:32 -08:00
654870a185
Fixing ssh_config proxy_command is not included
2014-02-09 16:27:32 -08:00
8d3afa73d2
providers/virtualbox: config to skip guest additions check
2014-02-08 18:35:09 -08:00
fbcac2978e
clean up usage
2014-02-08 00:20:50 -08:00
8c85e57db1
guests/linux: proper logic on ro
2014-02-07 16:04:36 -08:00
fcf2d42717
Merge pull request #2946 from mhahn/fix/master/2945
...
Fix #2945 : Reference correct options variable
2014-02-07 16:03:48 -08:00
8e9ceeaf5c
core: Machine has reference to Vagrantfile
2014-02-07 09:16:55 -08:00
cdf1d7f318
core: get rid of all uses of config_global
2014-02-06 20:22:15 -08:00
d68544a906
Ensure options[:mount_options] is defined before checking if it includes key
2014-02-06 14:06:47 -08:00
3631b250b7
Fix #2945 : Reference correct options variable
2014-02-06 13:59:56 -08:00
848fe5d166
kernel/v2: check for box updates by default
...
/cc @pearkes @armon
2014-02-05 21:20:33 -08:00
85aa7db17e
commands/box: repackage tests
2014-02-05 21:20:29 -08:00
7a6d1a3ff1
commands/box: update command can update a specific box now
2014-02-05 21:20:23 -08:00
386938f0b1
commands/box: update looks prettier on output
2014-02-05 21:20:22 -08:00
cf9004241e
core: output what we're updating and what we're not
2014-02-05 21:20:21 -08:00
88b64f93a4
commands/box: "update" command
2014-02-05 21:20:19 -08:00
61a1082d65
core: BoxCheckOutdated is *much* simpler, unified logic, tests
2014-02-05 21:20:18 -08:00
1a5ad9f3d5
providers/virtualbox: check for outdated on any start
2014-02-05 21:20:17 -08:00
bfca65b098
core: better output for BoxCheckOutdated
2014-02-05 21:20:16 -08:00
b5157df2cc
core: BoxCheckOutdated only runs if told to
2014-02-05 21:20:14 -08:00
d78194654d
core: ability to hide success UI
2014-02-05 21:20:12 -08:00
e537e02d9d
core: BoxCheckOutdated can check if a box is outdated
2014-02-05 21:20:11 -08:00
f2509f5c65
commands/box: outdated command to find outdated boxes
2014-02-05 21:20:10 -08:00
4cedd590d9
providers/virtualbox: use new HandleBox middleware
2014-02-05 21:20:05 -08:00
d40ff9c390
kernel_v2: test for box_url
2014-02-05 21:20:01 -08:00
b2fa785d07
core: Environment loads proper version of box
2014-02-05 21:19:51 -08:00
b71cde6b99
core: make box add UI much icer
2014-02-05 21:19:44 -08:00
c1d5c8f33c
commands/box: remove has --box-version flag
2014-02-05 21:19:43 -08:00
29da748702
commands/box/remove: update for new syntax
2014-02-05 21:19:41 -08:00
acc57a3c18
core: clarify output for boxadd error message
2014-02-05 21:19:36 -08:00
28a6beaa56
commands/box: can constrain the version
2014-02-05 21:19:25 -08:00
96e92167d9
commands/box: broken box adding, but more options/tests
2014-02-05 21:19:16 -08:00
e8197c4e87
commands/box: list works with the new versions
2014-02-05 21:19:14 -08:00
5030a16f84
kernel/v2: default all configs properly, remove config/default.rb
2014-02-05 15:36:35 -08:00
226dbccef8
guests/linux: don't chown VB shared folders if readonly [GH-2442]
2014-02-04 16:01:14 +01:00
a9337aba22
guests/{free,net}bsd: add `insert_public_key` capability
...
Copy the cap to missing *bsd variants.
2014-02-04 01:09:29 -03:00
ca56c913aa
kernel/v2: fix provisioner config with blocks
...
Regression from 10d5416
2014-02-04 00:51:01 -03:00
e5f3f1ffe3
Merge pull request #2892 from tmatilai/openbsd
...
OpenBSD is not a Linux derivative
2014-02-03 18:27:23 -08:00
3b5d6c65fd
guests/openbsd: Ensure that `PKG_PATH` is set when installing rsync
...
Depending on the shell, `PKG_PATH` is not necessarily set when Vagrant
runs `pkg_add`.
Ref: GH-2917
2014-02-03 23:17:54 -03:00
feeaa69615
kernel/v2: finalize the provisioner configs
2014-02-03 22:28:41 +01:00
59d257f832
provisioners/puppet: mergeable config
2014-02-03 22:27:23 +01:00
d864187b1a
provisioners/docker: configuration is mergeable
2014-02-03 22:23:26 +01:00
2cc56119b7
kernel/v2: support the preserve_order option (documented)
2014-02-03 22:03:20 +01:00
3aaa57cac9
kernel/v2: support merging properly
2014-02-03 21:30:01 +01:00
10d5416a90
kernel/v2: support overriding provisioner settings
2014-02-03 16:56:39 +01:00
38c2a48ff4
provisioners/docker: always pull images [GH-2901]
2014-02-03 16:26:38 +01:00
1d69e95c1c
provisioners/docker: config to disablize -d flag
2014-02-03 16:14:59 +01:00
c11820c848
guests/openbsd: Add back `insert_public_key` cap
...
Copied from linux guest.
2014-02-03 08:29:54 -03:00
767f147469
guests/openbsd: OpenBSD is not a Linux derivative
2014-02-03 08:27:57 -03:00
b89a47c955
hosts/opensuse: start NFS server properly [GH-2923]
2014-02-03 12:18:09 +01:00
f63ef395f1
Merge branch 'rsync_install' of https://github.com/tmatilai/vagrant into tmatilai-rsync_install
...
Conflicts:
plugins/guests/freebsd/plugin.rb
plugins/guests/netbsd/plugin.rb
plugins/guests/openbsd/plugin.rb
2014-02-03 12:12:49 +01:00
3c10bf7721
communicators/ssh: better error message
2014-02-03 12:09:13 +01:00
c1e18325ca
Merge pull request #2907 from justincampbell/scp-error-path
...
provisioners/file: Fix wording of upload permission error
2014-02-03 03:07:36 -08:00
56e85bc989
Merge pull request #2906 from frosario/cable_connected
...
providers/virtualbox: connect cable for bridged networking
2014-02-03 03:05:16 -08:00
ac439852ff
kernel/v2: allow IPs to end in ".1" [GH-2914]
2014-02-03 12:02:14 +01:00
592c577b2e
Merge pull request #2922 from tmatilai/file_provisioner_expand_path
...
provisioners/file: expand destination path if capable
2014-02-03 02:52:57 -08:00
466cf58476
ansible generated inventory: skip group variables
...
Except ':children' for groups of groups, it is safer to avoid generating
':suffix' blocks. At the moment Ansible only supports (but doesn't
recommend) group variables (:vars), and the Vagrant Ansible provisioner
won't support this way to define variables.
2014-02-02 23:28:04 +01:00
f564bf7410
Ansible Groups: Accept single item as String
...
Syntax errors in `ansible.groups` definition are not well handled:
Error returned: undefined method `each' for "machine1":String (NoMethodError)
Being tolerant here doesn't hurt and may avoid people get
confused/annoyed.
2014-02-02 23:21:06 +01:00
84308964e2
ansible generated inventory: deal with orphan VMs
...
env.active_machines can potentiall return 'invalid' machines:
- Ignore machines that are not declared in current Vagrantfile
- Warn when machines are missing (it usually occurs when the VM is
removed without `vagrant destroy` and some orphan metadata remains
in .vagrant/machines/...)
2014-02-02 23:06:27 +01:00
023d3115dd
guests/{free,net,open}bsd: Add `shell_expand_guest_path` capability
2014-02-02 17:38:24 -03:00
e634cdc824
guests: rename LinuxShellExpandFailed error to ShellExpandFailed
...
Make the error generic for all guests (`DarwinShellExpandFailed` didn't
even exist) and not tied to synced folder.
2014-02-02 17:26:54 -03:00
3bf5032d4b
Update Ansible provisioner to only create a single inventory file
...
The Ansible provisioner will now only create a single inventory file named,
"vagrant_ansible_inventory". All defined Vagrant machines will be added to
this inventory file. Provisioning will now include a "--limit=#{machine}"
option to scope Ansible provisioning tasks to just the current machine. Setting
the Ansible provisioner's "limit" config option will override the new default
limit. Ansible provisioning scripts will now have access to all other defined
machines and what groups they reside in.
2014-02-01 13:04:20 -08:00
dd9d20af88
Make sure synced folder types are always symbols
...
This will make sure that plugins that define synced folders after this
config object has been finalized won't have trouble because of
forgetting to use symbols instead of strings.
References https://github.com/fgrehm/vagrant-cachier/issues/76
2014-02-01 16:01:05 -02:00
b52958bfb6
provisioners/file: expand destination path if capable
2014-02-01 01:23:09 -03:00
ee2ae94c25
synced_folders/rsync: Install `rsync` on guest if needed
...
Add new `rsync_installed` and `rsync_install` guest capabilities
to detect and install `rsync`.
Also copy `rsync_pre` capability to all Unix guests.
2014-01-31 02:12:57 -03:00
a633b7343a
Fix wording of upload permission error
...
SCPPermissionDenied expects a path, and this is most likely the
destination (to) and not source (from).
[#2804 ]
2014-01-28 13:49:14 -05:00
ccf14bb398
Applying bugfix for cableconnected issue to earlier releases of virtualbox 4.x series
2014-01-28 11:05:44 -05:00
cd0c7dfbd9
Bugfix for github issue 2890.
...
Changing default behavior of vagrant up to enable "cableconnected" on bridged network devices
2014-01-28 10:54:39 -05:00
09955be2cd
provisioners/docker: configure auto start properly for new Docker
...
[GH-2874]
2014-01-21 20:52:27 -08:00
7e9ea7c1c6
hosts/redhat: recognize Korora [GH-2869]
2014-01-21 09:50:20 -08:00
Mitchell Hashimoto
Matthias Kadenbach
Gilles Cornu
Bryan Hunt
Jon Topper
Teemu Matilainen
A.J. Welch
Eugene Ware
Ryan Uber
Shane Gibbs
Lukasz Jastrzebski
gnawhleinad
Michael Hahn
Mark Aaron Shirley
Fabio Rehm
Justin Campbell
Freddie Rosario