Mitchell Hashimoto
67a0d3d5f1
communicators/ssh: rescue/show correct error messages
2014-02-23 22:31:37 -08:00
Mitchell Hashimoto
3324756e12
providers/virtualbox: don't log in trap context
2014-02-23 22:09:15 -08:00
Mitchell Hashimoto
a667893cbf
provisioners/shell: error if invalid encoding [GH-3000]
2014-02-23 21:50:53 -08:00
Mitchell Hashimoto
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
Jon Topper
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
Teemu Matilainen
7d90191212
provisioners/chef: DRY up `environment` and `node_name` configuration
2014-02-21 23:28:46 -03:00
Teemu Matilainen
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
A.J. Welch
9f0efc19a9
Fix "options are only allowed before install arguments" error.
...
This reverts feb748f488
and 7cd7077467
. `bootstrap_options` is
meant for flag options such as `-D`. This is demonstrated in the
example Vagrantfile from the original plugin:
github.com/saltstack/salty-vagrant/blob/develop/example/complete/Vagrantfile
Flag options must be appended to the options string before install
args such as `install_type` and `install_args`.
2014-02-19 20:24:05 -08:00
Teemu Matilainen
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
Mitchell Hashimoto
75dcc828ad
kernel/v2: fix error where options could be not hash
2014-02-18 10:41:14 -08:00
Teemu Matilainen
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
Gilles Cornu
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
Gilles Cornu
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
Teemu Matilainen
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
Eugene Ware
85d2f24607
more robust coreos checking
2014-02-15 15:50:11 +11:00
Eugene Ware
2d01691e0a
detect latest version of coreos
2014-02-15 15:03:06 +11:00
Mitchell Hashimoto
8c9fde41e9
provisioners/shell: clean up fixnum handling
2014-02-14 12:43:27 -08:00
Ryan Uber
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
Shane Gibbs
5600bd1067
Add support for multiple role paths in chef-solo
2014-02-14 21:48:18 +13:00
Mitchell Hashimoto
d0cd2464b2
providers/virtualbox: only clear forwarded ports if there are any
2014-02-13 21:04:56 -08:00
Mitchell Hashimoto
2fe2fe79ed
communicators/ssh: properly allow errors through while waiting
2014-02-13 21:04:41 -08:00
Mitchell Hashimoto
ed5e544e63
communicators/ssh: more verbose output about waiting for SSH
2014-02-13 20:59:26 -08:00
Mitchell Hashimoto
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
Mitchell Hashimoto
b1bed68bed
providers/virtualbox: cap to read forwarded ports
2014-02-13 16:34:34 -08:00
Mitchell Hashimoto
e909b91bfd
guests/linux: public key insertion is more robust
...
contents can have newlines (or not)
2014-02-12 22:11:33 -08:00
Mitchell Hashimoto
12b2572687
kernel/v2: capture error if provider config is bad [GH-2959]
2014-02-11 11:55:04 -08:00
Mitchell Hashimoto
dd9dd5127c
Merge pull request #2948 from gnawhleinad/master
...
command/*: clean up usage
2014-02-10 09:02:32 -08:00
Lukasz Jastrzebski
654870a185
Fixing ssh_config proxy_command is not included
2014-02-09 16:27:32 -08:00
Mitchell Hashimoto
8d3afa73d2
providers/virtualbox: config to skip guest additions check
2014-02-08 18:35:09 -08:00
gnawhleinad
fbcac2978e
clean up usage
2014-02-08 00:20:50 -08:00
Mitchell Hashimoto
8c85e57db1
guests/linux: proper logic on ro
2014-02-07 16:04:36 -08:00
Mitchell Hashimoto
fcf2d42717
Merge pull request #2946 from mhahn/fix/master/2945
...
Fix #2945 : Reference correct options variable
2014-02-07 16:03:48 -08:00
Mitchell Hashimoto
8e9ceeaf5c
core: Machine has reference to Vagrantfile
2014-02-07 09:16:55 -08:00
Mitchell Hashimoto
cdf1d7f318
core: get rid of all uses of config_global
2014-02-06 20:22:15 -08:00
Michael Hahn
d68544a906
Ensure options[:mount_options] is defined before checking if it includes key
2014-02-06 14:06:47 -08:00
Michael Hahn
3631b250b7
Fix #2945 : Reference correct options variable
2014-02-06 13:59:56 -08:00
Mitchell Hashimoto
848fe5d166
kernel/v2: check for box updates by default
...
/cc @pearkes @armon
2014-02-05 21:20:33 -08:00
Mitchell Hashimoto
85aa7db17e
commands/box: repackage tests
2014-02-05 21:20:29 -08:00
Mitchell Hashimoto
7a6d1a3ff1
commands/box: update command can update a specific box now
2014-02-05 21:20:23 -08:00
Mitchell Hashimoto
386938f0b1
commands/box: update looks prettier on output
2014-02-05 21:20:22 -08:00
Mitchell Hashimoto
cf9004241e
core: output what we're updating and what we're not
2014-02-05 21:20:21 -08:00
Mitchell Hashimoto
88b64f93a4
commands/box: "update" command
2014-02-05 21:20:19 -08:00
Mitchell Hashimoto
61a1082d65
core: BoxCheckOutdated is *much* simpler, unified logic, tests
2014-02-05 21:20:18 -08:00
Mitchell Hashimoto
1a5ad9f3d5
providers/virtualbox: check for outdated on any start
2014-02-05 21:20:17 -08:00
Mitchell Hashimoto
bfca65b098
core: better output for BoxCheckOutdated
2014-02-05 21:20:16 -08:00
Mitchell Hashimoto
b5157df2cc
core: BoxCheckOutdated only runs if told to
2014-02-05 21:20:14 -08:00
Mitchell Hashimoto
d78194654d
core: ability to hide success UI
2014-02-05 21:20:12 -08:00
Mitchell Hashimoto
e537e02d9d
core: BoxCheckOutdated can check if a box is outdated
2014-02-05 21:20:11 -08:00
Mitchell Hashimoto
f2509f5c65
commands/box: outdated command to find outdated boxes
2014-02-05 21:20:10 -08:00
Mitchell Hashimoto
4cedd590d9
providers/virtualbox: use new HandleBox middleware
2014-02-05 21:20:05 -08:00
Mitchell Hashimoto
d40ff9c390
kernel_v2: test for box_url
2014-02-05 21:20:01 -08:00
Mitchell Hashimoto
b2fa785d07
core: Environment loads proper version of box
2014-02-05 21:19:51 -08:00
Mitchell Hashimoto
b71cde6b99
core: make box add UI much icer
2014-02-05 21:19:44 -08:00
Mitchell Hashimoto
c1d5c8f33c
commands/box: remove has --box-version flag
2014-02-05 21:19:43 -08:00
Mitchell Hashimoto
29da748702
commands/box/remove: update for new syntax
2014-02-05 21:19:41 -08:00
Mitchell Hashimoto
acc57a3c18
core: clarify output for boxadd error message
2014-02-05 21:19:36 -08:00
Mitchell Hashimoto
28a6beaa56
commands/box: can constrain the version
2014-02-05 21:19:25 -08:00
Mitchell Hashimoto
96e92167d9
commands/box: broken box adding, but more options/tests
2014-02-05 21:19:16 -08:00
Mitchell Hashimoto
e8197c4e87
commands/box: list works with the new versions
2014-02-05 21:19:14 -08:00
Mitchell Hashimoto
5030a16f84
kernel/v2: default all configs properly, remove config/default.rb
2014-02-05 15:36:35 -08:00
Mitchell Hashimoto
226dbccef8
guests/linux: don't chown VB shared folders if readonly [GH-2442]
2014-02-04 16:01:14 +01:00
Teemu Matilainen
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
Teemu Matilainen
ca56c913aa
kernel/v2: fix provisioner config with blocks
...
Regression from 10d5416
.
2014-02-04 00:51:01 -03:00
Teemu Matilainen
e5f3f1ffe3
Merge pull request #2892 from tmatilai/openbsd
...
OpenBSD is not a Linux derivative
2014-02-03 18:27:23 -08:00
Teemu Matilainen
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
Mitchell Hashimoto
feeaa69615
kernel/v2: finalize the provisioner configs
2014-02-03 22:28:41 +01:00
Mitchell Hashimoto
59d257f832
provisioners/puppet: mergeable config
2014-02-03 22:27:23 +01:00
Mitchell Hashimoto
d864187b1a
provisioners/docker: configuration is mergeable
2014-02-03 22:23:26 +01:00
Mitchell Hashimoto
2cc56119b7
kernel/v2: support the preserve_order option (documented)
2014-02-03 22:03:20 +01:00
Mitchell Hashimoto
3aaa57cac9
kernel/v2: support merging properly
2014-02-03 21:30:01 +01:00
Mitchell Hashimoto
10d5416a90
kernel/v2: support overriding provisioner settings
2014-02-03 16:56:39 +01:00
Mitchell Hashimoto
38c2a48ff4
provisioners/docker: always pull images [GH-2901]
2014-02-03 16:26:38 +01:00
Mitchell Hashimoto
1d69e95c1c
provisioners/docker: config to disablize -d flag
2014-02-03 16:14:59 +01:00
Teemu Matilainen
c11820c848
guests/openbsd: Add back `insert_public_key` cap
...
Copied from linux guest.
2014-02-03 08:29:54 -03:00
Teemu Matilainen
767f147469
guests/openbsd: OpenBSD is not a Linux derivative
2014-02-03 08:27:57 -03:00
Mitchell Hashimoto
b89a47c955
hosts/opensuse: start NFS server properly [GH-2923]
2014-02-03 12:18:09 +01:00
Mitchell Hashimoto
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
Mitchell Hashimoto
3c10bf7721
communicators/ssh: better error message
2014-02-03 12:09:13 +01:00
Mitchell Hashimoto
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
Mitchell Hashimoto
56e85bc989
Merge pull request #2906 from frosario/cable_connected
...
providers/virtualbox: connect cable for bridged networking
2014-02-03 03:05:16 -08:00
Mitchell Hashimoto
ac439852ff
kernel/v2: allow IPs to end in ".1" [GH-2914]
2014-02-03 12:02:14 +01:00
Mitchell Hashimoto
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
Gilles Cornu
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
Gilles Cornu
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
Gilles Cornu
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
Teemu Matilainen
023d3115dd
guests/{free,net,open}bsd: Add `shell_expand_guest_path` capability
2014-02-02 17:38:24 -03:00
Teemu Matilainen
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
Mark Aaron Shirley
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
Fabio Rehm
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
Teemu Matilainen
b52958bfb6
provisioners/file: expand destination path if capable
2014-02-01 01:23:09 -03:00
Teemu Matilainen
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
Justin Campbell
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
Freddie Rosario
ccf14bb398
Applying bugfix for cableconnected issue to earlier releases of virtualbox 4.x series
2014-01-28 11:05:44 -05:00
Freddie Rosario
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
Mitchell Hashimoto
09955be2cd
provisioners/docker: configure auto start properly for new Docker
...
[GH-2874]
2014-01-21 20:52:27 -08:00
Mitchell Hashimoto
7e9ea7c1c6
hosts/redhat: recognize Korora [GH-2869]
2014-01-21 09:50:20 -08:00
Mitchell Hashimoto
714c690d8b
Merge pull request #2857 from mitchellh/f-ui-revamp
...
UI revamp
2014-01-20 16:22:36 -08:00
Mitchell Hashimoto
64649f8f1d
guests/coreos: restart etcd after configuring networks [GH-2852]
2014-01-18 11:05:29 -08:00
Mitchell Hashimoto
fbd8cfc628
hosts/gentoo: more robust check for systemctl path on Gentoo
2014-01-18 11:03:46 -08:00
Tim Gus
f0ec355a33
hosts/gentoo: fix nonstandard path to systemctl command
2014-01-18 00:13:54 -05:00