Mitchell Hashimoto
7abcea35b8
hosts/linux: escape regular expression for prune NFS exports [GH-2934]
2014-02-24 07:51:06 -08:00
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
Mitchell Hashimoto
ea77194384
providers/virtualbox: more detailed output
2014-01-17 21:03:01 -08:00
Mitchell Hashimoto
5b449c8000
providers/virtualbox: many `detail` level output
2014-01-17 21:03:00 -08:00
Mitchell Hashimoto
8a12bf8694
Merge pull request #2851 from BlackIkeEagle/reload-nfs-exports
...
guests/linux: use exportfs -a flag to avoid stale exports
2014-01-17 09:57:13 -08:00
Mitchell Hashimoto
dd33a26422
providers/virtualbox: network config uses proper format, tests [GH-2854]
2014-01-17 09:53:02 -08:00
BlackEagle
b30eacf94f
nfs_apply :: exportfs sometimes leaves exports behind
...
On my machine i had a case where /etc/exports was updated but the old
exports were still there. This was leading to
"exportfs: duplicated export entries" and eventually leading to nfs
being not available for the box.
changing the command exportfs -r to exportfs -ar seems to address this
issue.
Signed-off-by: BlackEagle <ike.devolder@gmail.com>
2014-01-17 10:54:17 +01:00
Mitchell Hashimoto
72702b4884
guests/tinycore: TinyCore Linux support
2014-01-16 17:18:54 -08:00
Mitchell Hashimoto
53347abbca
Merge pull request #2819 from stoned/guest-netbsd
...
Add NetBSD guest support
2014-01-16 10:37:54 -08:00
Mitchell Hashimoto
a19e442cf2
provisoiners/docker: only add user to group if not in it [GH-2838]
2014-01-16 10:34:08 -08:00
Mitchell Hashimoto
eecba611a4
providers/virtualbox: validate missing keys [GH-2831]
2014-01-16 09:43:31 -08:00
Mitchell Hashimoto
c3d0903f85
synced_folders/rsync: output directory under watch for rsync-auto
2014-01-16 09:11:41 -08:00
Mitchell Hashimoto
8a1995bec9
synced_folders/rsync: make sure host path ends in "/"
2014-01-15 21:22:37 -08:00
Mitchell Hashimoto
73b72deb0a
synced_folders/rsync: convert path to cygpath on Windows
2014-01-15 21:13:08 -08:00
Mitchell Hashimoto
285bda7a68
synced_folders/nfs: don't nfs_prune on hosts that don't support it
2014-01-15 20:28:27 -08:00
Mitchell Hashimoto
1d2da09953
Merge pull request #2824 from masteinhauser/patch-1
...
guests/solaris: More specific Solaris <11 detection.
2014-01-15 20:11:18 -08:00
Mitchell Hashimoto
eae2edf063
providers/virtualbox: retry list hostonlyifs [GH-2831]
2014-01-15 19:55:31 -08:00
Teemu Matilainen
e979b84d36
synced_folders/nfs: Register `nfs_client_install` caps to correct distros
2014-01-15 23:37:02 -03:00
Mitchell Hashimoto
ead1382343
provisioners/docker: fix wrong variable usage
...
caught by @pda
2014-01-15 17:33:55 -08:00
Mitchell Hashimoto
4fab57576b
synced_folders/rsync: run hostpath through fs_real_path
...
This fixes issues with drive letter casing on Windows
2014-01-15 11:30:32 -08:00
Gustavo Gama
262e2c0192
Fix typo
2014-01-15 09:40:41 -02:00
Mitchell Hashimoto
2ca498a5dd
provisioners/docker: build images using new DSL
2014-01-14 09:22:55 -08:00
Mitchell Hashimoto
b3de12702a
Merge branch 'add_building_local_dockerfiles' of https://github.com/jpfuentes2/vagrant into jpfuentes2-add_building_local_dockerfiles
2014-01-14 08:17:44 -08:00
Myles Steinhauser
b34fdf010b
More specific Solaris 11 detection
2014-01-14 09:56:01 -05:00
Myles A. K. Steinhauser
e5445442c1
More specific Solaris <11 detection.
...
Note: This will probably break on Solaris 12+, but not certain of a better approach for now.
2014-01-14 09:52:27 -05:00
Mitchell Hashimoto
526231812f
website/docs: better docs
2014-01-13 22:29:10 -08:00
Stoned Elipot
10169f8e99
Add NetBSD guest support
2014-01-14 07:25:35 +01:00
Mitchell Hashimoto
04f1854840
synced_folders/rsync: unit tests for the callback, fix bug
2014-01-13 22:01:09 -08:00
Mitchell Hashimoto
fe2844ca59
synced_folders/rsync: rsync-auto command
2014-01-13 21:43:31 -08:00
Mitchell Hashimoto
c05a44face
synced_folders/rsync: pass --delete option to delete bad files
2014-01-13 11:40:46 -08:00
Mitchell Hashimoto
b4b62daf5c
synced_folders/rsync: expand host paths relative to root path
2014-01-13 11:34:49 -08:00
Mitchell Hashimoto
309d12a16b
synced_folders/rsync: `vagrant rsync` syncs the folders
2014-01-13 11:25:29 -08:00
Mitchell Hashimoto
59218ded68
synced_folders/rsync: move rsync logic out to helper
2014-01-13 11:01:50 -08:00
Mitchell Hashimoto
9b383740ba
hosts/bsd: use Util::Which instead of system("which")
2014-01-12 22:37:39 -08:00
Mitchell Hashimoto
b8601423c7
hosts/bsd: don't execute shell for sudo commands [GH-2808]
2014-01-12 22:34:45 -08:00
Mitchell Hashimoto
8bc36824bf
commands/list-commands: lists all commands primary and non-primary
2014-01-11 09:32:13 -08:00
Mitchell Hashimoto
6a7e07c53f
provisioners/chef: don't follow symlink when chown
2014-01-11 08:02:59 -08:00
Mitchell Hashimoto
7b2a0716f1
synced_folders/rsync: warn if password auth
2014-01-10 20:37:11 -08:00
Mitchell Hashimoto
55b0dffd36
synced_folders/rsync: output what is being excluded
2014-01-10 18:06:16 -08:00
Mitchell Hashimoto
60f3d224c9
synced_folders/rsync: can exclude files
2014-01-10 18:01:38 -08:00
Mitchell Hashimoto
2e3fcf576c
synced_folders/rsync: allow guests to execute things before
2014-01-10 17:51:44 -08:00
Mitchell Hashimoto
38fbbb6c56
synced_folders/rsync: Initial commit working
2014-01-10 17:40:29 -08:00
Mitchell Hashimoto
fcae8dd687
Merge pull request #2766 from graingert/patch-1
...
provisioners/salt: Allow defining of <install-type> and <install-type-args>
2014-01-10 15:43:25 -08:00
Mitchell Hashimoto
9a58caaf9c
synced_folders/nfs: always prune [GH-2738]
2014-01-10 15:41:57 -08:00
Mike Fiedler
9679eccb06
extend Virtualbox convenince methods
...
In the vein of #2426 , I too can never remember syntax, and end up
hunting for either an exisiting Vagrantfile or starting to dig up
details.
2014-01-10 12:41:23 -05:00
Mitchell Hashimoto
91380c0650
synced_folders/nfs: automatically install NFS client if possible
...
If guests have the following capabilities, automatic NFS client
installation will be done:
* nfs_client_installed - Checks if the NFS client is installed
* nfs_client_install - Install the NFS client
Support is already in for Debian, Ubuntu, RedHat, CentOS, and Fedora
2014-01-09 16:58:20 -08:00
Mitchell Hashimoto
5e835f4201
Merge pull request #2792 from smoyer/redhat_hostname_patch
...
guests/redhat: use FQDN for hostname
2014-01-08 20:58:59 -08:00
Mitchell Hashimoto
732a03c1c4
guests/linux: properly quote and insert public key
2014-01-08 15:12:26 -08:00
smoyer
3964298504
This was introduced in 1.4.1 with d26c147
.
...
This PR sets the active hostname back to the name specified in the Vagrantfile (fqdn) and updates the unit tests.
Setting it to the short name causes loads of problems while configuring the system. I've had issues with sudoers hostname matching, Weblogic certificate generation and a few others. Even if I changed all of the Chef recipes, the fqdn is set in /etc/sysconfig/network so the active hostname will switch to the fqdn after a reboot.
2014-01-08 17:49:54 -05:00
Mitchell Hashimoto
9a419c3f63
Merge pull request #2784 from mitchellh/f-host-capabilities
...
Host Capabilities
2014-01-08 08:54:26 -08:00
Teemu Matilainen
64ea647e09
provisioners/chef-solo: Fix copy&paste "Puppet" from a deprecation message
2014-01-08 13:27:35 -03:00
Mitchell Hashimoto
e2af545182
kernel/v2: a host always exists, remove dumb check
2014-01-07 21:20:28 -08:00
Mitchell Hashimoto
e9f6c81ab7
hosts/*: proper detect API
2014-01-07 21:18:36 -08:00
Mitchell Hashimoto
26b564566b
hosts/null: needs to accept env as param
2014-01-07 21:14:33 -08:00
Mitchell Hashimoto
a72e7473d5
hosts/windows: convert
2014-01-07 21:13:21 -08:00
Mitchell Hashimoto
4d47dae5b9
many more hosts converted
2014-01-07 21:11:59 -08:00
Mitchell Hashimoto
4cec8b48d9
hosts/freebsd: convert
2014-01-07 21:01:03 -08:00
Mitchell Hashimoto
a6c7cc481e
convert more hosts: arch and linux
2014-01-07 20:53:39 -08:00
Mitchell Hashimoto
bdb88da743
hosts/bsd: convert to new style
2014-01-07 20:39:24 -08:00
Mitchell Hashimoto
5e490e3746
Get tests to pass
2014-01-07 19:26:03 -08:00
Mitchell Hashimoto
93e365bb33
core: Vagrant::Environment uses new host settings
2014-01-07 19:11:08 -08:00
Mitchell Hashimoto
ea502c5c3d
commands/plugin: vagrant plugin install can accept multiple
2014-01-07 14:17:48 -08:00
Mitchell Hashimoto
24a2892236
Update CHANGELOG and website
2014-01-07 14:11:33 -08:00
Ryan S. Brown
b53ae446d2
Allow `vagrant (un)install plugin1 plugin2 plugin3`
2014-01-07 14:09:31 -08:00
Mitchell Hashimoto
86cab61c27
commands/plugin: support installing from file
2014-01-06 09:27:37 -08:00
Thomas Grainger
feb748f488
Allow defining of <install-type> and <install-type-args>
2014-01-06 12:22:43 +00:00
Mitchell Hashimoto
f612ec7549
core: support plugin sources, and mask Bundler errors
2014-01-05 23:13:49 -08:00
Mitchell Hashimoto
0117521744
commands/plugin: vagrant update is fancier now (see website docs)
2014-01-05 22:33:05 -08:00
Mitchell Hashimoto
561e65ec72
commands/plugin: list shows version constraints and entrypoints
2014-01-05 21:16:41 -08:00
Mitchell Hashimoto
bef7051943
commands/plugin: InstallGem tests
2014-01-05 21:08:55 -08:00
Mitchell Hashimoto
aeb0d1a480
commands/plugin: fix plugin existence middleware, add tests
2014-01-05 20:57:55 -08:00
Mitchell Hashimoto
5fe2994005
commands/plugin: convert all actions to use the new classes
2014-01-05 20:50:25 -08:00
Mitchell Hashimoto
8904319beb
commands/plugin: install version and entrypoints work
2014-01-05 20:47:02 -08:00
Mitchell Hashimoto
9dc1307b7c
commands/plugin: remove --plugin-prerelease
2014-01-05 17:46:20 -08:00
Mitchell Hashimoto
d368b3cf62
core: Tolerate syntax errors in ~/.gemrc [GH-2760]
2014-01-05 17:11:24 -08:00
Mitchell Hashimoto
8823f43f3a
commands/plugin: error if uninstall non-existent plugin
2014-01-05 16:03:00 -08:00
Mitchell Hashimoto
e1c9431085
commands/plugin: uninstall works again
2014-01-05 16:02:00 -08:00
Mitchell Hashimoto
95aeb9443d
commands/plugin: Remove PruneGems
2014-01-05 14:55:44 -08:00
Mitchell Hashimoto
86610bf735
installing gems works
2014-01-05 14:54:50 -08:00
Mitchell Hashimoto
1eef75a715
commands/plugin: list uses PluginManager
2014-01-05 08:42:34 -08:00
Mitchell Hashimoto
279b171339
commands/plugin: remove unnecessary line
2014-01-04 17:22:07 -08:00
Mitchell Hashimoto
ae17dc09eb
commands/plugin: list plugins uses Bundler
2014-01-04 17:21:53 -08:00
Mitchell Hashimoto
8450f20e87
Move StateFile into Vagrant::Plugin core
2014-01-04 16:45:41 -08:00
Mitchell Hashimoto
5387984e0f
commands/plugin: allow within Bundler env (cause we always are)
2014-01-04 16:32:46 -08:00
Mitchell Hashimoto
4c6957b5cf
communicators/ssh: if insert_key is false, don't insert a key
2014-01-03 11:29:44 -08:00
Mitchell Hashimoto
54e640b0c9
communicators/ssh: output UI when inserting key
2014-01-03 11:22:05 -08:00
Mitchell Hashimoto
b3a9e6a088
insert_public_key cap, and use that if it exists
2014-01-03 11:13:21 -08:00
Mitchell Hashimoto
38e7166a21
communicators/ssh: support passwords
2014-01-03 09:55:34 -08:00
Mitchell Hashimoto
e115322e78
core: accept passwords in ssh_info
2014-01-03 09:48:35 -08:00
Mitchell Hashimoto
2f7163386d
providers/virtualbox: don't error when intnet set to "true" [GH-2751]
2014-01-03 08:31:14 -08:00
Mitchell Hashimoto
e29bcba955
provisioners/puppet: alphabetize
2014-01-02 14:44:49 -08:00
Mitchell Hashimoto
040e1a2e0a
provisioners/chef: synced_folder_type
2014-01-02 14:40:57 -08:00
Mitchell Hashimoto
1da271c536
provisioners/puppet: synced_folder_type [GH-2709]
2014-01-02 14:37:47 -08:00
Mitchell Hashimoto
862331fbf0
Merge branch '1.4.3'
...
Conflicts:
CHANGELOG.md
lib/vagrant/version.rb
2014-01-02 10:16:52 -08:00
Mitchell Hashimoto
3f2d3886b2
providers/virtualbox: fix package [GH-2739]
2014-01-02 10:09:05 -08:00
Ryan S. Brown
23ce05d166
detect fedora 19 and 20
2014-01-02 11:09:11 -06:00
Mitchell Hashimoto
437b186966
Merge pull request #2734 from seginoviax/funtoo
...
New guest: Funtoo
2014-01-01 20:48:46 -08:00
Seginoviax
12176515da
Add funtoo guest support. Based heavily on https://github.com/mitchellh/vagrant/pull/1840
2013-12-31 17:33:10 -08:00
Seginoviax
a4c74ea87a
Revert "Add funtoo guest support. Based heavily on https://github.com/mitchellh/vagrant/pull/1840 "
...
This reverts commit 3559c08086
.
2013-12-31 17:12:19 -08:00
Mitchell Hashimoto
7141be065a
Merge pull request #2674 from phinze/static-nfs-guest-ips
...
core: problems with using VirtualBox guest properties for reading NFS Guest IP
2013-12-31 11:00:23 -08:00
Mitchell Hashimoto
7f5c85cf20
provisioners/chef-solo: delete data bag secret [GH-2712]
2013-12-31 10:44:08 -08:00
Mitchell Hashimoto
54f4cffc00
providers/virtualbox: export after checking if package exists [GH-2380]
2013-12-31 08:45:56 -08:00
Seginoviax
3559c08086
Add funtoo guest support. Based heavily on https://github.com/mitchellh/vagrant/pull/1840
2013-12-31 00:54:32 -08:00
Mitchell Hashimoto
f89c4412b2
synced_folders/nfs: lock around sudo input [GH-2680]
2013-12-30 14:45:40 -08:00
Mitchell Hashimoto
28720b181d
guests/ubuntu: remove mount_nfs cap
2013-12-30 08:12:10 -08:00
Paul Hinze
fc66ec1660
providers/virtualbox: allow and prefer static guest IPs for NFS
...
Since vbox guest properties are proving to be less reliable than we had
hoped, bring back the static config parsing mechanism for finding a
guest IP to hand to NFS. If we find a static IP (or set of IPs) we'll
use that instead of trying to probe guest properties.
This retains NFS support for DHCP interfaces while regaining the
reliability that we previously had when static IPs were required.
2013-12-28 17:01:08 -06:00
Mitchell Hashimoto
5d39cc381f
Merge pull request #2694 from tmatilai/plugin-json-errors
...
core: show more informative error if plugin.json parsing fails
2013-12-28 13:12:59 -08:00
Mitchell Hashimoto
0316665ad8
commands/plugin: use default version requirement
2013-12-28 14:10:57 -07:00
Mitchell Hashimoto
35d4737553
Merge pull request #2705 from tmatilai/upstart-emit-nfs
...
Emit upstart event `vagrant-mounted` also on NFS mounts
2013-12-28 12:50:53 -08:00
Mitchell Hashimoto
2cf864e95b
hosts/bsd: check exports only if exports file exists [GH-2714]
2013-12-28 13:48:13 -07:00
Marc Meszaros
13ff159d8c
Fix salt provisioner error namespace to be more consistent with other provisioners
2013-12-27 22:38:44 -05:00
Marc Meszaros
194d7d11cd
Add error messages to localization file for salt provisioner
2013-12-27 22:37:54 -05:00
Tobias Bähr
364488eba8
Set default value to avoid a prompt
2013-12-22 18:48:14 +01:00
Teemu Matilainen
572cdeeda9
guests/linux: Emit upstart event on VirtualBox using the expanded path
2013-12-22 08:55:59 -03:00
Teemu Matilainen
2fab268ede
guests/linux: Emit upstart event `vagrant-mounted` also on NFS mounts
...
Complements #2502 , and fixes error on VMs without upstart (like #2596 ).
2013-12-22 08:46:24 -03:00
Teemu Matilainen
a5b84f413e
core: More informative error if plugin.json parsing fails
2013-12-20 07:10:10 -03:00
Mitchell Hashimoto
489506ff83
guests/linux: up the amount of retries for NFS mounts
2013-12-18 08:38:31 -08:00
Mitchell Hashimoto
9ac4ec85dd
Merge pull request #2677 from purpleidea/fix_puppet_apply
...
provisioner/puppet: do not prepend default path because it can override modules.
2013-12-18 08:31:21 -08:00
James Shubin
d4c76d1bcf
Do not prepend default path because it can override modules.
...
It is common for Puppet to manage itself. If the puppet code you are
deploying pushes files to /etc/puppet/modules/, then prepending this
path can break deployment because it will override the module path if
the deployment code is changing. There is no good reason to include this
path. Puppet has built in defaults for this reason.
2013-12-17 14:29:54 -05:00
Charles Blaxland
7518bf94eb
Force rm of chef config files #2669
2013-12-17 17:53:52 +11:00
Mitchell Hashimoto
042a8d6428
Merge pull request #2667 from gildegoma/bugfix_ansible_raw_args
...
provisioner/ansible: Fix a bug in `raw_arguments` option
2013-12-16 13:15:30 -08:00
Gilles Cornu
e5f45e2b79
Ansible: Fix a bug in `raw_arguments` option
...
Without this change, it is not possible to pass more than one "raw"
argument, which was not the expected behavior. In addition to Array
format, String (for a single argument) is still accepted (for sake of
"backward compatibility" and ease of use).
Note: Due to low/expert usage of this option, I think that it is not
necessary to add more robust validation on this parameter (e.g. Array
of String type checking or argument syntax pattern matching). Use it at
your own risk ;-)
2013-12-16 21:20:10 +01:00
Charlie Huggard
d26c1471d7
Refactor ChangeHostName for EL.
...
Based off of the Debian pattern. Need to add tests.
Related to #2653 and #2592
2013-12-16 01:52:39 -06:00
Mitchell Hashimoto
da91572ce7
commands/init: error if can't write Vagrantfile [GH-2660]
2013-12-15 11:28:51 -08:00
Gilles Cornu
213534d185
Merge pull request #2606 from maspwr/ansible-groups
...
Add ability to use Ansible groups in generated inventory. Fixes #2551 .
2013-12-14 07:03:22 -08:00
Mitchell Hashimoto
2c568a75f2
commands/ssh: use proper variable
2013-12-13 22:32:01 -08:00
Mitchell Hashimoto
2bebf188d6
hosts/bsd: check for exports file issues prior to exporting NFS
2013-12-13 22:14:13 -08:00
Mitchell Hashimoto
c1141dded3
providers/virtualbox: don't clear /etc/exports on BSDs for NFS [GH-2645]
2013-12-13 22:03:14 -08:00
Mitchell Hashimoto
902b769e6b
core: -t/-T work for vagrant ssh -c [GH-2618]
2013-12-13 21:07:54 -08:00
Fabio Rehm
46ba43e6ac
provisioners/docker: Display warning in case a version get specified on the Vagrantfile and the guest is a RedHat-ian guest [GH-2649]
2013-12-13 23:06:20 -02:00
Fabio Rehm
6f304d5e29
provisioners/docker: Move DockerConfigureVagrantUser capability up to Linux guests [GH-2649]
2013-12-13 23:06:20 -02:00
Fabio Rehm
5a842fc609
provisioners/docker: Check if epel-release is installed on RedHat-ian guests before attempting installation [GH-2649]
2013-12-13 23:06:20 -02:00
Naoto TAKAHASHI
746d406558
add docker for redhat
2013-12-14 02:35:34 +09:00
Teemu Matilainen
d321b9199e
provisioners/chef: fix node/client deletion when node_name is not set [GH-2345]
...
V2 config uses `hostname` instead of `host_name`.
2013-12-13 00:51:22 -03:00
Arthur Neves
c57073da7b
Rename docker_client and docker_installer
...
We can rename those classes and remove the docker_ prefix as they
already have a module namespace.
2013-12-12 14:59:03 -05:00
Markus Kern
c8a09b344b
guests/redhat: Don't error if ifdown fails [GH-2614]
2013-12-10 20:04:36 +00:00
Mitchell Hashimoto
05b2e03586
guests/redhat: don't ifdown non-existent interfaces [GH-2614]
2013-12-10 09:04:20 -08:00
Mitchell Hashimoto
ed4cfa913c
Merge pull request #2620 from ShonM/master
...
guests/freebsd: Update FreeBSD configure_networks with less shell specifics
2013-12-10 08:53:34 -08:00
Paul Hinze
abe0731d2e
guests/{ubuntu,debian}: fix change_host_name for trailing dots [GH-2610]
...
When `/etc/hosts` contained a FQDN with a trailing dot, the `\b` in the
sed expression would not match, since dot is not considered to be a word
character.
Fix this by regexp-escaping the hostname search, and matching the end of
the line on optional space followed by additional characters.
Also add some tests that extract the regexp used by sed and verify that
it does what we want. These will hopefully serve us in the future if we
ever need to test additional edge cases.
2013-12-09 18:56:45 -06:00
Shon M
3e1471fb53
Update FreeBSD configure_networks with less shell specifics
2013-12-09 17:27:54 -07:00
Jacques Fuentes
579cc8e558
Remove defunct @build_options reference
2013-12-09 18:36:57 -05:00
Jacques Fuentes
1738f9dccf
Add option to Docker provisioner to build local images
2013-12-09 17:54:32 -05:00
Mark Aaron Shirley
906579d25a
Add ability to use Ansible groups in generated inventory. Fixes #2551 .
2013-12-08 23:08:03 -08:00
Matt Alexander
edeb5f0e9f
Add the symlink back that disabled renaming of network interface names
2013-12-07 14:59:40 -06:00
Matt Alexander
df67d2b44f
Run "ip link set [eth1] down" before running "netctl start [eth1]" in Arch guest network configuration
2013-12-07 14:22:19 -06:00
Mitchell Hashimoto
d80f32c20f
synced_folders/nfs: allow plugins to provide valid NFS ids
2013-12-06 16:42:34 -08:00
Mitchell Hashimoto
2c65d247da
core: Allow options to be passed down into SF cleanup
2013-12-06 16:40:24 -08:00
Mitchell Hashimoto
76df3ced03
synced_folders/nfs: style
2013-12-06 15:07:55 -08:00
Mitchell Hashimoto
55931d507e
Merge branch 'nfs-sync-folder-cleanup' of https://github.com/emyl/vagrant into emyl-nfs-sync-folder-cleanup
...
Conflicts:
plugins/providers/virtualbox/action.rb
2013-12-06 15:06:34 -08:00
Mitchell Hashimoto
f3d71de022
Merge pull request #2591 from instilled/arch-netctl-fix
...
guests/arch: netctl fix
2013-12-06 15:02:41 -08:00
Mitchell Hashimoto
89f4e14ab3
Merge pull request #2585 from mitchellh/2585-fix-docker-image-assignment
...
provisioner/docker: unable to run multiple docker containers based off the same image
2013-12-06 14:56:15 -08:00
Teemu Matilainen
b0919b916b
Remove extraneous character
...
Going down? ;)
2013-12-06 18:57:27 -03:00
Mitchell Hashimoto
5b7a4d7f6e
Merge pull request #2596 from tmatilai/fix-initctl-test
...
guests/linux: fix testing if initctl exists
2013-12-06 13:22:03 -08:00
Mitchell Hashimoto
b65462faf1
providers/virtualbox: resume should wait for boot
2013-12-06 13:21:07 -08:00
Teemu Matilainen
c566465bdc
Fix testing if initctl exists
...
If /sbin/initctl was not found, the command (`false && ...`) returned
non-zero exit code leading to Vagrant throwing an exception.
2013-12-06 18:17:41 -03:00
Mitchell Hashimoto
17b68f7d50
provisioners/puppet: use unique directory for each definition
2013-12-06 12:39:50 -08:00
Mitchell Hashimoto
f8223d4704
provisioners/chef: support proper counter for multiple chefs
2013-12-06 12:26:48 -08:00
Mitchell Hashimoto
38f931ba93
provisioners/shell: array args properly work
2013-12-06 11:28:32 -08:00
Fabio Rehm
8688c6b8b2
provisioners/docker: Only assign the `image` config in case it was not specified
2013-12-05 22:12:44 -02:00
Mitchell Hashimoto
0d02ada43b
providers/virtualbox: only clear shared folders if we have a VM
2013-12-05 13:39:23 -08:00
John Bellone
bebaa63063
[provisioner/chef]: Update base to fix typo.
...
It seems this was introduced by accident with #2281 .
2013-12-05 15:24:53 -05:00
me
2a75c34d62
systemctl wasn't a good idea
2013-12-05 16:01:44 +01:00
me
158d82ea39
Avoid udev rule masking and configure ifaces with sed instead.
2013-12-05 15:16:59 +01:00
Teemu Matilainen
897fde3274
Add missing argument to ProviderVirtualBox::SyncedFolder#driver call
...
GH-2577 missed passing the `machine` to the `driver` method.
2013-12-05 00:21:16 -03:00
Fabio Rehm
7e0b0a5a3c
provisioners/docker: Extract container lookup method
2013-12-04 22:13:17 -02:00
Fabio Rehm
c7a5592b96
provisioners/docker: Ensure checks for whether the container exists / is running works accross multiple Docker versions [GH-2579]
2013-12-04 22:10:39 -02:00
Teemu Matilainen
294f4def91
Fix `vagrant plugin` commands
...
`StateFile#installed_plugins` returns now a Hash instead of Array.
Fixes regression from 39b2539
.
2013-12-04 18:25:33 -03:00
Mitchell Hashimoto
3df245f1fd
provisioners/chef: create/chown backup folders [GH-2281]
2013-12-04 11:51:05 -08:00
Mitchell Hashimoto
d354cdda4a
core: request users upgrade plugins if they're old
2013-12-04 11:43:39 -08:00
Mitchell Hashimoto
236141ba90
commands/plugin: old state files default to 0 for vagrant version
2013-12-04 11:29:17 -08:00
Mitchell Hashimoto
39b2539ec7
commands/plugin: state file keeps track of the Vagrant version
2013-12-04 11:17:48 -08:00
Emiliano Ticci
07bbca426e
NFS/VBox: remove dedicated cleanup action in favour of native routine.
2013-12-04 12:29:09 +01:00
Emiliano Ticci
c95fc4e27c
VirtualBox shared folders: remove dedicated cleanup action in favour of native routine.
2013-12-04 12:22:01 +01:00
Mitchell Hashimoto
4f17a70c4e
commands/plugin: ignore default gems when pruning
...
For modern RubyGems compatibility
2013-12-03 23:48:06 -08:00
Mitchell Hashimoto
e83070371d
kernel/v2: fix validation on checksum types
2013-12-03 18:46:22 -08:00
Mitchell Hashimoto
832a5ef70b
providers/virtualbox: clean up synced folders on destroy
2013-12-03 18:44:37 -08:00
Mitchell Hashimoto
ca521887eb
Merge pull request #2561 from emyl/synced-folder-cleanup-v2
...
core: Enhance the synced folder plugin implementation with a cleanup routine
2013-12-03 18:08:42 -08:00
Mitchell Hashimoto
146bc34019
Merge pull request #2549 from mitchellh/f-docker-provisioner
...
docker provisioner
2013-12-03 17:47:42 -08:00
Mitchell Hashimoto
8f4fa897d0
provisioners/docker: use proper UNSET_VALUE for no value
2013-12-03 16:19:08 -08:00
Mitchell Hashimoto
999ce22354
provisioners/docker: output version when installing
2013-12-03 14:39:32 -08:00
Mitchell Hashimoto
f7916c0cff
provisioners/docker: output for each image pulling
2013-12-03 14:38:38 -08:00
Mitchell Hashimoto
ecbd0bfa85
provisioners/docker: style nitpicks
2013-12-03 14:36:14 -08:00
Mitchell Hashimoto
8d6cac959f
provisioners/docker: only allow 'args' special
2013-12-03 14:35:56 -08:00
Mitchell Hashimoto
33d3c28086
provisioners/docker: simplify run, output which are running
2013-12-03 14:33:13 -08:00
Mitchell Hashimoto
c55f7dfd64
provisioners/docker: allow images to be configured with images:
2013-12-03 14:25:20 -08:00
Mitchell Hashimoto
d3b7bffc65
provisioners/docker: style nitpick on unless
2013-12-03 14:19:31 -08:00
Mitchell Hashimoto
dda7cbb412
provisioners/docker: make sure version is correct type, fix Ruby warning
2013-12-03 14:18:30 -08:00
Mitchell Hashimoto
5ee3a06740
provisioners/chef: fix validate return so that it is properly formatted
2013-12-03 13:59:59 -08:00
Mitchell Hashimoto
d9dc2d6cfd
guests/linux: --no-wait on emit [GH-2564]
2013-12-03 12:14:10 -08:00
Mitchell Hashimoto
9cd9e6e55d
communicators/ssh: add -E to sudo to preserve env
2013-12-03 12:07:14 -08:00
Mitchell Hashimoto
d2bc1dbc3b
Merge pull request #2560 from phinze/vbox-nfs-dhcp-support
...
providers/virtualbox: support DHCP interfaces for NFS
2013-12-03 11:49:54 -08:00
Paul Hinze
c25172d0f7
providers/virtualbox: support DHCP interfaces for NFS
...
Previously, we required a host-only interface with a static IP for NFS
to work in VirtualBox, because we needed access to the guest's IP in
order to properly configure mount commands.
After boot, VirtualBox exposes the IP addresses of a guest's network
adapters via the "guestproperty" interface.
This adds support for reading VirtualBox guest properties to the
VirtualBox driver and utilizes that support to prepare NFS settings,
which removes the necessity for a static IP for NFS to work.
In this commit we also start building out scaffolding for unit testing
vbox actions and drivers.
Test plan:
- Prepare a Vagrantfile with the following:
* private network with type: :dhcp
* synced folder with nfs: true
- Boot a VM from this Vagrantfile using the virtualbox provider
- Machine should boot successfully with working synced folder
2013-12-03 10:21:28 -05:00
Emiliano Ticci
578393ac8e
Add cleanup routine to synced folder plugin implementation
2013-12-02 11:19:09 +01:00
Mitchell Hashimoto
72edddbb09
core: do proper type conversions for box checksum types
2013-12-01 23:03:21 -08:00
Mitchell Hashimoto
555f4c7dcf
kernel/v2: support checksum on box config
2013-12-01 23:03:21 -08:00
Mitchell Hashimoto
1094ac976e
core: support checksum on box add
2013-12-01 23:03:20 -08:00
Nicolas Delaby
7cd7077467
salt-bootstrap.sh: options are only allowed before install arguments
2013-11-29 15:52:12 +01:00
Fabio Rehm
3289141fc3
provisioners/docker: Clean up some leftovers from vocker
2013-11-29 10:22:06 -02:00
Fabio Rehm
82fc9330af
provisioners/docker: Simplify raising of Docker related errors
2013-11-29 10:22:06 -02:00
Fabio Rehm
0536817e90
provisioners: Import Docker provisioner code from Vocker
2013-11-29 10:22:06 -02:00
Mitchell Hashimoto
cfb258a55b
provisioners/shell: s/unless/if !/
2013-11-29 00:02:20 -08:00
Paul Hinze
fef60242b0
provisioners/shell: fix validation for args [GH-1949]
...
The logic change in 57d4775140
introduced
a bug where neither strings nor arrays provided as `args` for shell
provisioners would pass validation.
This fixes that problem along with a few extras:
- split out arg validation into a private method
- update comment describing valid args
- add a few unit tests around config validation
2013-11-28 19:54:10 -06:00
Elan Ruusamäe
1df4f5a8ed
require pld/cap/change_host_name
2013-11-27 09:38:28 +02:00
Elan Ruusamäe
2416149aa3
fix hostname change on pld
2013-11-27 09:35:18 +02:00
Mitchell Hashimoto
db9c8dd6b3
core: validate box_download_ca_cert_file, expand
2013-11-26 21:10:33 -08:00
Mitchell Hashimoto
d0f14250d6
core: can specify config.vm.box_download_ca_cert
2013-11-26 19:35:04 -08:00
Mitchell Hashimoto
cd3e19306c
commands/box/add: custom CA cert [GH-2337]
2013-11-26 19:32:56 -08:00
Mitchell Hashimoto
798432febe
provisioners/chef: validate environments path [GH-2381]
2013-11-26 18:57:27 -08:00
Mitchell Hashimoto
6f2d6981cb
website/docs: better Chef docs [GH-2436]
2013-11-26 11:44:16 -08:00
Mitchell Hashimoto
fc190fad9f
guests/redhat: DHCP_HOSTNAME set to hostname [GH-2441]
2013-11-26 11:28:47 -08:00
Mitchell Hashimoto
5790235a54
Merge pull request #2539 from bearstech/debian_ifdown_ifup
...
guests/debian: ifdown is not enough for network config
2013-11-26 11:16:37 -08:00
Mitchell Hashimoto
cd106986b4
provisioners/ansible: use the first private key
...
/cc @gildegoma - Does Ansible support multiple private keys? Vagrant
now does, so this isn't exactly safe.
2013-11-26 10:07:52 -08:00
Mathieu Lecarme
09a86bd70a
Sometimes, ifdown is not enough.
2013-11-26 13:40:50 +01:00
Mitchell Hashimoto
9dfac9557b
provisioners/puppet: fix some bonehead mistakes
2013-11-25 22:46:10 -08:00
Mitchell Hashimoto
25a8491465
provisioners/puppet: manifests path can be in the VM [GH-1805]
2013-11-25 22:39:20 -08:00
Mitchell Hashimoto
d7b74ca8b9
core: config.vm.box_url can be array of urls [GH-1958]
2013-11-25 21:57:20 -08:00
Mitchell Hashimoto
d88e3dcff2
kernel/v2: new style default box url
2013-11-25 18:46:54 -08:00
Mitchell Hashimoto
7d1fe7c6fe
kernel/v2: properly set default value for client cert
2013-11-25 16:51:22 -08:00
Mitchell Hashimoto
13b52f6b6e
Merge branch 'client-certs' of https://github.com/sthulb/vagrant into sthulb-client-certs
...
Conflicts:
config/default.rb
lib/vagrant/action/builtin/handle_box_url.rb
plugins/commands/box/command/add.rb
2013-11-25 16:50:11 -08:00
Mitchell Hashimoto
8581a93e76
provisioners/chef: upload encrypted data bag secret to prov path
...
[GH-1246]
2013-11-25 15:55:00 -08:00
Mitchell Hashimoto
45e09eb677
core: allow multiple private keys [GH-907]
2013-11-25 15:45:39 -08:00
Mitchell Hashimoto
d08e3f7ab3
provisioners/puppet: use better flags for one-time run
2013-11-25 15:28:17 -08:00
Mitchell Hashimoto
4a3259443d
provisioners/puppet: make the output a bit clearer
2013-11-25 15:18:35 -08:00
Mitchell Hashimoto
e72cd9c98e
provisioners/puppet: can specify a client key/cert
2013-11-25 15:17:05 -08:00
Mitchell Hashimoto
57c25a26ad
provisioners/puppet: update config to new style
2013-11-25 15:07:12 -08:00
Mitchell Hashimoto
57d4775140
provisioners/shell: allow array args [GH-1949]
2013-11-25 13:36:51 -08:00
Mitchell Hashimoto
741930b439
Merge pull request #1949 from mpapis/feature/shell_provisoner_array_args
...
provisioners/shell: implement array arguments from #1569
2013-11-25 13:31:48 -08:00
Mitchell Hashimoto
48973a72d5
commands/box/list: clean up
2013-11-25 13:26:46 -08:00
Mitchell Hashimoto
3bedc77cc4
Merge branch '2293-track-box-url' of https://github.com/fgrehm/vagrant into fgrehm-2293-track-box-url
...
Conflicts:
plugins/commands/box/command/list.rb
2013-11-25 13:20:26 -08:00
Mitchell Hashimoto
195f0d9639
guests/linux: emit upstart event for vagrant mounted if avail [GH-2502]
2013-11-25 11:31:15 -08:00
Mitchell Hashimoto
602505a136
providers/virtualbox: some validation around internal networks
2013-11-25 11:25:10 -08:00
Mitchell Hashimoto
2d957cdaab
providers/virtualbox: internal networks [GH-2020]
2013-11-25 11:13:46 -08:00
Mitchell Hashimoto
cc57933675
update changelog
2013-11-24 21:29:04 -08:00
Mitchell Hashimoto
10daa6fddf
Merge pull request #2366 from gildegoma/ansible-extra-vars
...
provisioners/ansible: Improvements for 'extra_vars' argument
2013-11-24 21:21:44 -08:00
Mitchell Hashimoto
6baab10df4
communicators/ssh: pty can be enabled
2013-11-24 16:48:07 -08:00
Mitchell Hashimoto
7ba9d2d0a0
commands/init: add --output flag [GH-1364]
2013-11-24 11:53:15 -08:00
Mitchell Hashimoto
5cbc54d570
commands/box: list has machine-readable output
2013-11-24 11:42:24 -08:00
Mitchell Hashimoto
15d639c8dc
website: document machine-readable output
2013-11-24 11:37:57 -08:00
Mitchell Hashimoto
42a71a953d
commands/status: add machine-readable output
2013-11-24 11:11:38 -08:00
phinze
688bca14f5
refactoring ubuntu/debian change_host_name
...
there's been a lot of churn around this code, so i figure it was worth
trying to clean it up.
- the methods were doing a lot, so make them into template methods with
one helper per step
- spread out /etc/hosts regexp into a couple of helper variables for
clarity
- remove handling for broken hostname implementations (like basing all
of the checks on name.split('.')[0]), since it seems reasonable to
remove code dedicated only to handling broken boxes
- DRY up the shared code between debian/ubuntu implementations, which
clarifies the differences as well
- add unit tests around the behavior; this will help us in the future
to separate flaws in our understanding from flaws in implementation
- includes a new DummyCommunicator in tests which should be useful in
supporting additional unit testing of this kind
- manually tested this on squeeze, wheezy, precise, quantal, raring,
and saucy successfully.
handles the issue in #2333
2013-11-24 11:46:12 -06:00
Mitchell Hashimoto
f66d08d73c
commands/plugin: style nitpick
2013-11-23 16:45:45 -08:00
Mitchell Hashimoto
63005fc1c6
Merge pull request #2420 from tmacedo/rubygems_2_compatibility
...
core: compatibility with rubygems 2.x
2013-11-23 16:44:10 -08:00
Mitchell Hashimoto
c8be50c69e
providers/virtualbox: get rid of some 4.3 global state
2013-11-23 16:30:09 -08:00
Mitchell Hashimoto
2044c7445e
Merge pull request #2484 from andyfowler/virtualbox-parallel-import
...
provider/virtualbox: virtualbox parallel box import
2013-11-23 16:23:07 -08:00
Mitchell Hashimoto
cfe17076b5
providers/virtualbox: nitpick on style
2013-11-23 16:16:45 -08:00
Mitchell Hashimoto
56eb53d8af
Merge pull request #2483 from andyfowler/retryable-customize
...
providers/virtualbox: use Retryable for Virtualbox customize & sane_defaults actions
2013-11-23 16:12:20 -08:00
Mitchell Hashimoto
b65b22cef2
update changelog
2013-11-23 16:05:44 -08:00
Mitchell Hashimoto
2a35ec425c
Merge pull request #2505 from jaugustin/shell-keep-color
...
provisioner/shell: add keep_color option to allow custom color output
2013-11-23 16:03:15 -08:00
Mitchell Hashimoto
46d9ded812
commands/box/add: add --clean flag to ignore continuation
2013-11-23 15:55:52 -08:00
Mitchell Hashimoto
45702f9d44
Merge branch 'issue_2333' of https://github.com/elliotsegler/vagrant into elliotsegler-issue_2333
...
Conflicts:
plugins/guests/ubuntu/cap/change_host_name.rb
2013-11-23 15:38:49 -08:00
Mitchell Hashimoto
97389d4255
core: output synopsis with command [GH-2249]
2013-11-23 14:00:42 -08:00
Mitchell Hashimoto
23bdbd6fd8
synced_folders/nfs: specify nfs_udp false to disable udp [GH-2304]
2013-11-23 13:43:48 -08:00
Mitchell Hashimoto
88425f0146
Merge pull request #2390 from borgstrom/master
...
core: allow owner & group to be supplied as an Integer and skip lookup
2013-11-23 11:46:50 -08:00
Mitchell Hashimoto
a4fe547536
Merge pull request #2444 from tmatilai/debian_hostname_fix
...
guests/debian: Fix hostname setting also in Debian, part N
2013-11-23 11:45:38 -08:00
Mitchell Hashimoto
aed61291e8
Update CHANGELOG
2013-11-23 11:45:06 -08:00
Mitchell Hashimoto
4e75e39ee5
Merge pull request #2426 from tmatilai/virtualbox_memory
...
providers/virtualbox: Add shortcut for setting the memory size for VirtualBox VM
2013-11-23 11:44:13 -08:00
Mitchell Hashimoto
5b71cf87f3
Merge pull request #2450 from onejli/master
...
guests/redhat: ifdown ethN before munging ifcfg-ethN
2013-11-23 11:40:02 -08:00
Mitchell Hashimoto
05e9dc6e59
Update CHANGELOG
2013-11-23 11:36:20 -08:00
Mitchell Hashimoto
dcf57bd2cc
guests/linux: increase sleep time btween NFS mount retries
2013-11-23 11:35:27 -08:00
Mitchell Hashimoto
52c27cd498
Merge pull request #2448 from rimckenn/patch-1
...
hosts/bsd: don't set both maproot and mapall
2013-11-23 11:34:27 -08:00
Mitchell Hashimoto
9362063623
Merge pull request #2487 from hatsuseno/master
...
hosts/gentoo: Restart NFS on Gentoo host instead of starting [GH-2487]
2013-11-23 11:25:42 -08:00
Mitchell Hashimoto
c00b045f53
providers/virtualbox: retry suspended check [GH-2479]
2013-11-23 11:20:22 -08:00
Mitchell Hashimoto
33273ee561
Merge pull request #2529 from markpeek/markpeek-freebsd-nobashshell
...
guests/freebsd: Allow the FreeBSD plugin to install without bash [GH-2485]
2013-11-23 11:04:29 -08:00
Mitchell Hashimoto
0425d1712b
synced_folders/nfs: config goes here
2013-11-23 10:49:51 -08:00
Mitchell Hashimoto
2c8b6ace7f
providers/virtualbox: output UI
2013-11-22 19:33:17 -08:00
elliotsegler
803e78a5d4
fixing error in comment #2333
2013-11-23 10:18:59 +08:00
Mitchell Hashimoto
0b9861db7d
providers/virtualbox: fix broken NFS check
2013-11-22 17:29:35 -08:00
Mitchell Hashimoto
850c9ea7a6
kernel: handle new NFS types
2013-11-22 17:22:47 -08:00
Mitchell Hashimoto
22a5430068
synced_folders/nfs: use proper error classes
2013-11-22 17:18:08 -08:00
Mitchell Hashimoto
be6d4cc116
providers/virtualbox: make sure sf host paths are strings
2013-11-22 17:16:21 -08:00
Mitchell Hashimoto
35ac7da5a0
providers/virtualbox: don't use NFS middleware anymore
2013-11-22 17:13:53 -08:00
Mitchell Hashimoto
52fe93cc41
synced_folders/nfs: begin implementation (not functional)
2013-11-22 16:51:55 -08:00
Mitchell Hashimoto
9d3818a380
providers/virtualbox: use new SyncedFolders middleware
2013-11-22 16:21:14 -08:00
Mark Peek
d5dcf84d62
Allow the FreeBSD plugin to install without bash [GH-2485]
...
The default shell is "bash -l" which does not get installed by default
on FreeBSD. This change allows the plugin to override the default shell
and use a known installed shell (sh).
2013-11-22 15:30:12 -08:00
elliotsegler
a80de51054
Fixes recommended by phinze for #2333
2013-11-22 11:55:17 +08:00
Mitchell Hashimoto
97148379d2
providers/virtualbox: implement the synced folder plugin
2013-11-21 17:38:17 -08:00
Mitchell Hashimoto
504707f96a
Merge pull request #2482 from andyfowler/safer-vbox-names
...
core: safer default VM names for Virtualbox
2013-11-21 15:01:31 -08:00
Daniel Miller
31894171d3
Make salt bootstrap work on systems without python
2013-11-21 10:42:06 -05:00
phinze
4225b0eb7b
provider/virtualbox: fix bad constant reference in dhcp error
...
refs #2454
2013-11-20 11:15:25 -06:00
jaugustin
722e9e6afb
[Provisioner][Shell] add keep_color option to allow custom color output
2013-11-16 13:34:58 +01:00
Rudolf Leermakers
aa749db079
Restart NFS on Gentoo host instead of starting
...
In the case that NFS is already started on a Gentoo host, /etc/init.d/nfs start will not reload exports, but fail. /etc/init.d/nfs reload is known to fail for some esoteric configurations of /etc/exports, restart should be safe for existing connections.
2013-11-11 12:30:40 +01:00
Andy Fowler
b13122cab7
use Retryable for virtualbox customize + defaults
...
when up-ing several boxes at once, VBoxManage modifyvm gets cranky and throws random lock errors. this adds the existing retryable logic to
the customize and sane_defaults actions, both of which fire a bunch of
modifyvm commands, all of which are fine to run multiple times.
2013-11-09 18:16:47 -05:00
Andy Fowler
d775756d18
use a safer default name for virtualbox
...
if the same vagrantfile is up'd in the same second in the same basedir
this caused a conflict,
most notably, all jenkins jobs sit in a 'workspace' directory, which
breaks if more than one job launches from the same trigger.
2013-11-09 15:54:46 -05:00
Andy Fowler
2e9286b4d3
use vbox4.2 driver parallel-safe box import in 4.3
...
uses what @smoyer did for vbox 4.2 in vbox 4.3,
tested against VBoxManage 4.3.2
2013-11-08 12:48:37 -05:00
Scott Moyer
c2a3a30e35
Update the virtualbox driver to import base boxes into a unique(ish) VM folder to prevent collisions.
2013-11-07 17:07:29 -05:00
Jonathan Li
1ad756d52c
ifdown ethN before munging ifcfg-ethN (i.e. removing previous vagrant config for network interface)
2013-11-02 12:35:37 -07:00
rimckenn
3047b81256
Update host.rb
...
mapall= and maproot= are mutually exclusive options. Currently, when trying to use maproot=, mapall= is getting automatically added, which prevents us from using the NFS mount. This change turns off the adding of mapall= if maproot= has been specified as an option.
2013-11-01 14:44:49 +00:00
Teemu Matilainen
2073a1a939
Fix hostname setting also in Debian, part N
...
Port #2384 / #2383 for Debian guests.
2013-10-31 21:39:45 -03:00
Fabio Rehm
48875124b9
commands/box: Read box URL and downloaded date from JSON
2013-10-29 13:09:24 -02:00
Fabio Rehm
05a8cf523a
core: Get rid of code that deals with box info on a separate statefile
2013-10-29 13:09:24 -02:00
Fabio Rehm
18cf66e83a
commands/box: List base box downloaded URL and datetime when `-i` gets provided to `box list`
2013-10-29 13:09:24 -02:00
Fabio Rehm
cbc7e7eedb
commands/box: Preparing to display additional box information on `box list`
2013-10-29 13:09:23 -02:00
Fabio Rehm
031119a858
commands/box: Extract a base class for dealing with StateFile instantiation
2013-10-29 13:09:23 -02:00
Fabio Rehm
1c689d2211
core: Remove box information from state file after box removal
2013-10-29 13:09:23 -02:00
Fabio Rehm
e4b5db829e
commands/box: Extract box removal code from `box remove` command into a builtin action
2013-10-29 13:09:23 -02:00
Fabio Rehm
17fd5f9e4e
commands/box: Introduce a StateFile for keeping track of downloaded boxes
2013-10-29 13:09:23 -02:00
Teemu Matilainen
3368ef610a
Add shortcut for setting the memory size for VirtualBox VM
2013-10-28 00:43:33 -03:00
Tiago Macedo
2d66d94ebe
compatibility with rubygems 2.x
2013-10-25 11:27:17 +02:00
Mitchell Hashimoto
2ca350c816
Merge pull request #2400 from hikch/master
...
guests/freebsd: fix nfs mount fail with FreeBSD9.1 (synced_folder).
2013-10-23 23:15:33 -07:00
Mitchell Hashimoto
af66984ca1
Merge pull request #2404 from canausa/patch-1
...
commands/provision: add --no-parallel
2013-10-23 23:13:04 -07:00
Stephan Meissl
889233ed94
Automatically enable symlinks on vboxsf for VirtualBox 4.1 (see #713 and 387692f9c8
).
2013-10-23 23:00:07 +02:00
canausa
10883b3be6
Add --no-parallel to provision
2013-10-21 10:19:42 -04:00
Heikichi Umehara
c0eb9bd35a
fix nfs mount fail with freebsd.
2013-10-21 08:42:57 +09:00
Evan Borgstrom
9c8ead1ca3
Restore correct pathing
2013-10-17 22:45:23 -04:00
Evan Borgstrom
ebb85b57fd
Allow owner & group to be supplied as an Integer and skip lookup
2013-10-17 22:40:21 -04:00
Mitchell Hashimoto
673a06b54d
hosts/gentoo: use subprocess machinery
...
/cc @timgus
2013-10-17 08:32:09 -10:00
Mitchell Hashimoto
7a99e7a62e
Merge pull request #2382 from timgus/gentoo_systemd
...
hosts/gentoo: recognize systemd for nfsd startup and replace "service" command with /etc/init.d/nfs
2013-10-17 11:29:28 -07:00
Nathan Mische
0c238741d3
Fixing so localhost hosts file entry is not lost when updating hostname. Addresses Issue #2383 .
2013-10-17 12:56:59 -04:00
Tim Gus
7bfc3ea16e
hosts/gentoo: recognize systemd for nfsd startup and
...
replace "service" command with /etc/init.d/nfs
2013-10-17 11:11:59 -04:00
Mitchell Hashimoto
b2070eec53
providers/virtualbox: Support VirtualBox 4.3 [GH-2374]
2013-10-15 11:42:22 -10:00
Teemu Matilainen
330f72eae2
Fix hostname setting also in Debian
...
Same fix as #2334 .
2013-10-15 15:57:40 -03:00
Teemu Matilainen
535eb35206
Use old name instead of hard coded 'precise64'
2013-10-15 15:57:15 -03:00
Mitchell Hashimoto
f988db97bd
Merge pull request #2334 from elliotsegler/issue_2333
...
guests/ubuntu: Hostname and FQDN should be done in one line
2013-10-14 20:21:53 -07:00
Mitchell Hashimoto
2be01284ea
provisioners/chef: fix exception during node cleanup [GH-2345]
2013-10-14 17:12:49 -10:00
Mitchell Hashimoto
4f8b751c4c
Merge pull request #2347 from dougm/esxi-guest
...
guests/esxi: Add support for VMware ESXi guests
2013-10-14 20:09:25 -07:00
Mitchell Hashimoto
cfd81da97e
Merge pull request #2359 from viq/patch-1
...
provisioners/salt: fix seed_master key file name
2013-10-14 20:06:51 -07:00
Mitchell Hashimoto
cb74d208ea
Merge pull request #2358 from sgronblo/disallow_dots_and_hyphens_at_start_of_hostname
...
core: disallow dot and hyphen as first character of hostnames
2013-10-14 19:59:22 -07:00
Gilles Cornu
5aff4a1f20
Ansible: Improvements for 'extra_vars' argument
...
`extra_vars` argument can now:
- contains a hierarchical set of parameters (instead of flat Key-Value Pairs)
- alternatively refers to a configuration file (instead of embedded Hash)
See Ansible Documentation for version requirement details:
http://www.ansibleworks.com/docs/playbooks_variables.html#passing-variables-on-the-command-line
2013-10-12 00:29:39 +02:00
Tomdarkness
27c7243219
Move exception raising back into retryable block in VirtualBox driver command execution
...
By moving the exception throwing back into the retryable block it actually enables the retryable to function properly by retrying, if appropriate, when an certain exception is raised.
2013-10-11 18:32:54 +01:00
viq
fee0f8d8ab
Fix seed_master key file name
...
As per https://github.com/saltstack/salty-vagrant/pull/98 and https://github.com/saltstack/salty-vagrant/issues/97 the expected file name for minion is 'minion', not 'seed-minion.pub'
2013-10-10 13:04:31 +02:00
Sam Gronblom
9a7ca06cfa
Disallow dot and hyphen as first character of hostnames
...
- Causes hostname to be set to an invalid value on some systems which
also causes malfunction of hostname -f so it cannot be changed
2013-10-10 14:42:48 +09:00
Doug MacEachern
6c9edbbdc6
guests/esxi: Add support for VMware ESXi guests
2013-10-08 21:47:32 -07:00
Laurent Raufaste
157a7081ba
Update boundary usage in the sed regexp to update the hosts file
2013-10-08 20:14:22 -04:00
Elliot Segler
06aaa6e6ea
#2333 , more fixes - right order to get fqdn right
2013-10-08 17:53:27 +08:00
Elliot Segler
1abcf1e54f
Better fix for issue #2333 , does localhost as well so we dont break local name resolution for things like puppet
2013-10-08 17:01:54 +08:00
Elliot Segler
9ca6fbe8f4
Hostname and FQDN should be done in one line
2013-10-06 15:33:00 +08:00
Mitchell Hashimoto
193f172b7c
Merge pull request #2313 from jeffasinger/salt-overstate
...
provisioner/salt: adding overstate support to the salt provisioner
2013-10-05 11:46:01 -07:00
Mitchell Hashimoto
4049fd136f
Merge pull request #2329 from mpioli/redhat
...
guests/redhat: create from fedora guest (migrate)
2013-10-05 11:43:42 -07:00
Matthew
e9903422cc
detect Red Hat Enterprise Linux 4 and Oracle Linux
2013-10-05 18:01:27 +01:00
Matthew
b16d56c717
rename host plugin (fedora to redhat)
2013-10-05 17:40:23 +01:00
Matthew
d1871b5c15
do not use systemd on current versions of CentOS or RHEL
2013-10-05 17:33:13 +01:00
Matthew Johnson
b514f0c321
remove extra alias for vvv verbosity
2013-10-04 15:32:10 -04:00
Matthew Johnson
e5a2f1e8b7
fix ansible-playbook runs when verbosity is not specified
2013-10-04 02:58:49 -04:00
Jeff Singer
852812f778
Adding overstate support to the salt provisioner
2013-10-03 15:28:35 -04:00
egghead
4f1a65f74b
fixing default verbosity
2013-10-02 02:28:55 +00:00
Mitchell Hashimoto
6fc0f03865
Merge pull request #2275 from jabclab/ansible-buffering
...
Resolving #2194 (Ansible buffering output if run as subprocess)
2013-10-01 14:26:25 -07:00
Mitchell Hashimoto
9fcc89bcf1
provisioners/chef: use real variable in delete from chef sever [GH-2300]
2013-10-01 14:13:16 -07:00
Mitchell Hashimoto
d052069eb7
Merge pull request #2273 from czi/fix/master/my_contribution
...
guests/suse: Update CFEngine provisioners plugin for SuSE install compatibility
2013-10-01 11:43:10 -07:00
Ian Heggie
4f11716633
Remove old /tmp/bootstrap_salt.sh before uploading as it may not be writeable
2013-09-29 21:05:59 +10:00
jabclab
c51952a68d
Resolving #2194 (Ansible buffering output if run as subprocess)
2013-09-26 10:13:44 +01:00
U-quartz\Cory
ecb6ebaf81
add cfengine provisioner suse install support
2013-09-25 20:29:25 -05:00
Mitchell Hashimoto
d970c4e03f
Merge pull request #2254 from Caustic/fix-hostname-debian
...
guests/debian,ubuntu: Fixed fqdn handling
2013-09-25 10:36:33 -07:00
François Charlier
c1228ae206
Allow to change the DHCP_HOSTNAME on RedHat
2013-09-24 23:48:10 +02:00
Mitchell Hashimoto
33dd881ad7
provisioners/chef: disable color if Vagrant has no color [GH-2246]
2013-09-22 14:15:55 -05:00
Alan Braithwaite
7d53047a92
Fixed fqdn handling on debian/ubuntu
...
The issue was that the old method simply didn't work. When the hosts
file should look like:
127.0.1.1 host.fqdn.com host
It looked like:
127.0.1.1 host.fqdn.com host old.fqdn.com old
Or this if the user didn't set a fqdn
127.0.1.1 host host old.fqdn.com old
This patch fixes that.
2013-09-22 00:33:24 -07:00
Pete Michaud
e65ac705b4
fixed missing backtick
2013-09-21 21:41:06 -05:00
Mitchell Hashimoto
36bd52713b
provisioners/ansible: convert extra vars to strings [GH-2244]
2013-09-20 21:16:50 -07:00
Mitchell Hashimoto
7df64dff0c
Merge pull request #2242 from bt5e/move-up-chmod-in-puppet
...
provisioners/puppet-apply: moved chmod up before verify_shared_folders check #2241
2013-09-20 21:12:10 -07:00
Mitchell Hashimoto
79fa7000fa
providers/virtualbox: don't touch DYLD_* anymore.
...
Subprocess handles this
2013-09-20 17:57:44 -07:00
Mitchell Hashimoto
4d03a7359e
guests/linux: fail after a number of attempts
2013-09-20 17:52:36 -07:00
Mitchell Hashimoto
62e357ffcd
guests/linux: only successful mount if exit status 0
2013-09-20 17:50:29 -07:00
Mitchell Hashimoto
8c4ea4f47b
Update CHANGELOG
2013-09-20 17:24:59 -07:00
Mitchell Hashimoto
5fe6d7a525
Merge pull request #2235 from aleno/shell
...
provisioners/shell: Don't replace Windows newlines to Unix if shell is set as binary
2013-09-20 17:23:48 -07:00
Ben Tse
cd79563837
#2241 moved chmod up before verify_shared_folders check
2013-09-19 14:26:35 -04:00
Alexander Norström
b20fe8d41e
Dont replace Windows newlines to Unix if shell is set as binary
2013-09-19 13:33:58 +02:00
viq
8fd2337038
Fix invocation of initialize
...
Fixes #2229 for me
2013-09-19 11:55:46 +02:00
Mitchell Hashimoto
f9e4ea9ce8
communicators/ssh: timeout waiting for connection + header [GH-2226]
2013-09-18 09:32:30 -07:00
keyist
8cc5b4ddb5
hosts/arch: remove duplication with HostsLinux
2013-09-16 21:27:15 -07:00
Mitchell Hashimoto
ee9fc00a04
provisioners/ansible: default output level is verbose [GH-2194]
2013-09-16 21:02:22 -07:00
Mitchell Hashimoto
b9801f44a0
guests/linux: try `id -g` to determine group as well [GH-2197]
2013-09-16 20:51:09 -07:00
Mitchell Hashimoto
93f2e9ebbb
communicators/ssh: increase conect timeout [GH-2163]
2013-09-15 17:37:40 -07:00
Mitchell Hashimoto
5e468dd110
core: Convert FP ports to ints [GH-2173]
2013-09-15 17:29:49 -07:00
Mitchell Hashimoto
cf5d1f40e0
Merge pull request #2191 from Raman148/fix/master/exportssecurity
...
hosts/bsd: use `sudo` not `su` for NFS export writing
2013-09-15 16:46:53 -07:00
Mitchell Hashimoto
a36f06f28f
Update CHANGELOG
2013-09-15 16:39:54 -07:00
Mitchell Hashimoto
1900f5ecc2
Merge pull request #2200 from mikerowehl/virtualbox_destroy_unused_interfaces_fix
...
providers/virtualbox: call rest of destroy middleware stack
2013-09-15 16:37:36 -07:00
Mitchell Hashimoto
77bd296a07
Merge pull request #2203 from copperlight/ansible-host-key-checking
...
provisioners/ansible: add ansible.host_key_checking configuration parameter
2013-09-15 16:35:45 -07:00
Jurnell Cockhren
624a9dd2fd
need_configure should return true when master_config is defined as well.
...
This fixes #2204 and fixes saltstack/salty-vagrant#100
2013-09-14 09:49:37 -05:00
Matthew Johnson
131ce4fc97
add ansible.host_key_checking configuration parameter
2013-09-13 22:48:12 -04:00
Mike Rowehl
251cafe5e4
Call the rest of the middleware stack all the time.
2013-09-13 09:34:40 -07:00
Raman Nanda
1566280061
Cleanup for Pull Request
2013-09-11 17:57:54 -04:00
Raman Nanda
0c03ad18fc
Updating for NFS Fix
2013-09-11 17:22:13 -04:00
David
d3ab29e279
Put nfs opts setup in separate function and configured to be called by both generic linux and arch nfs_options. Fixes undefined method join exception in arch
2013-09-10 11:39:41 -04:00
Marc Schlaich
42e41eecc9
Removed duplicate entry.
2013-09-09 11:17:04 +02:00
Mitchell Hashimoto
8a9ee5d8dc
hosts/arch: correct variable for NFS exports [GH-2161]
2013-09-07 17:49:52 -07:00
Mitchell Hashimoto
9e878b3bfb
Merge pull request #2153 from gildegoma/ansible-docs-cleanup-and-vv
...
provisioners/ansible: Update documentation, Code Cleanup (and Extend Log Verbosity option)
2013-09-07 17:46:28 -07:00
Mitchell Hashimoto
c29925a6a5
Merge pull request #2156 from gustavobgama/fix/master/linux_nfs_error
...
hosts/linux: fixed options to NFS: no_subtree and check became no_subtree_check
2013-09-07 17:44:25 -07:00
Eric G. Wolfe
1186c86718
[GH-1977] revert and alternate fix
...
@mitchellh, the internal encoding doesn't seem to work. Therefore,
I reverted that previous change to vagrant.rb.
However, I found two alternate solutions. Either transcoding,
`/etc/redhat-release` to ISO-8859-1 on open, or using something
like File.binread to transcode the file contents to raw.
2013-09-07 13:40:23 -04:00
Gustavo Gama
693b813d63
Fixed options to NFS: no_subtree and check became no_subtree_check
2013-09-07 12:09:09 -03:00
Gilles Cornu
ce4f2824f4
Ansible: Support three available verbosity levels
2013-09-07 15:17:43 +02:00
Gilles Cornu
8a925e3461
Ansible: code cleanup and documentation update
...
Clean Up (code logic is kept unmodified):
* Remove repetition around `ansible.limit` option (merge conflict issue)
* Re-add missing comments from GH-1697 (merge conflict issue)
* Reorder instructions
Documentation for following changes:
* [GH-1697] add more options
* [GH-1979] extra verbosity option
2013-09-07 14:49:12 +02:00
Mitchell Hashimoto
517ac20822
guests/coreos: proper guest IP detection [GH-2146]
2013-09-06 11:30:53 -07:00
Mitchell Hashimoto
bad4c78766
hosts/linux: fix undefined variable in NFS export [GH-2137]
2013-09-06 08:54:02 -07:00
Mitchell Hashimoto
0879c1d624
provisioners/chef: fix syntax error
2013-09-05 23:59:11 -07:00
Mitchell Hashimoto
a06742b8ef
provisioners/chef: env config less restrictive
2013-09-05 16:34:21 -07:00
Mitchell Hashimoto
e05cca7ed4
provisioners/puppet: sudo test for folders for umask
2013-09-05 16:24:30 -07:00
Mitchell Hashimoto
592a800f84
provisioners/chef: work with restrictive umask [GH-2121]
2013-09-05 16:12:56 -07:00
Mitchell Hashimoto
1769fbcba8
core: dup option hashes everywhere
2013-09-05 14:26:53 -07:00
Mitchell Hashimoto
0b94ed44b7
core: dup the synced folder options [GH-2134]
2013-09-05 14:25:38 -07:00
Mitchell Hashimoto
d4e6372fa7
provisioners/chef: chown/create folder before access [GH-2121]
2013-09-04 20:43:22 -07:00
Mitchell Hashimoto
4c35f6d071
core: exec with the proxy command if specified
2013-09-04 17:23:43 -07:00
Mitchell Hashimoto
763bdc42f4
Merge pull request #1537 from wormzer/master
...
communicator/ssh: Additional proxy_command option
2013-09-04 17:18:59 -07:00
Mitchell Hashimoto
f82711259c
provisioners/all: report proper invalid keys [GH-2117]
2013-09-04 16:57:15 -07:00
Mitchell Hashimoto
51bdae3b90
Merge pull request #2112 from markpeek/markpeek-file
...
Add a file provisioner
2013-09-03 14:09:10 -07:00
Mark Peek
c158b4aff4
Add a file provisioner
...
Add a provisioner which will upload host files and directories to the
guest via the scp channel. This is useful for populating user specific
files into the guest. This is a rename from scpupload to file and updated
against master. [GH-1357]
2013-09-03 11:03:46 -07:00
Mitchell Hashimoto
3154669835
provisioners/shell: prefer "." over "::"
...
/cc @fgrehm
2013-09-03 10:44:16 -07:00
Mitchell Hashimoto
c752c37586
Merge branch 'shell-provisioner-remote-script' of https://github.com/fgrehm/vagrant into fgrehm-shell-provisioner-remote-script
...
Conflicts:
CHANGELOG.md
2013-09-03 10:40:24 -07:00
Mitchell Hashimoto
89ecb7850f
Merge branch 'more_ansible_options' of https://github.com/gildegoma/vagrant into gildegoma-more_ansible_options
...
Conflicts:
plugins/provisioners/ansible/provisioner.rb
2013-09-02 15:30:49 -07:00
Mitchell Hashimoto
154b32e561
Merge pull request #1745 from jheise/master
...
providers/virtualbox: static ip addresses on public networks
2013-09-02 15:10:33 -07:00
Mitchell Hashimoto
b8dc881792
commands/up: validate provision-with args [GH-1957]
2013-09-02 15:06:03 -07:00
Mitchell Hashimoto
e8d2e05c4e
Merge pull request #2077 from miurahr/exportfs
...
Improvement of Linux supports and NFS handling using exportfs
2013-09-02 14:52:59 -07:00
Mitchell Hashimoto
ac1404b9ac
commands/plugin: Add "update" subcommand
2013-09-02 09:31:26 -07:00
Mitchell Hashimoto
c95a68ed5d
commands/reload: dont' provision by default
2013-09-02 09:13:22 -07:00
Mitchell Hashimoto
a656a99654
communicators/ssh: remove use of nonexistent config
2013-09-02 09:11:39 -07:00
Mitchell Hashimoto
63d0400de7
kernel_v1: don't upgrade "max_tries" and "timeout" because they're gone
2013-09-02 09:09:39 -07:00
Mitchell Hashimoto
e2ddab532d
core: Don't provision after first `up` by default [GH-1776]
2013-09-02 09:03:46 -07:00
Mitchell Hashimoto
ab7cee1ae0
Merge pull request #2107 from fgrehm/remove-dead-code
...
core: Remove dead code from Guest
2013-09-01 13:47:18 -07:00
Mitchell Hashimoto
7897de3fbd
guests/ubuntu: enable the new mount_nfs stuff
2013-09-01 13:46:09 -07:00
Mitchell Hashimoto
8bc01c7cb1
Merge pull request #1717 from toretore/master
...
guests/ubuntu: Emit Ubuntu Upstart 'vagrant-mounted' (regression)
2013-09-01 13:43:26 -07:00
Fabio Rehm
77dd626341
guest: Remove dead code
2013-09-01 17:41:17 -03:00
Mitchell Hashimoto
d7b398a905
Merge branch 'fix/master/puppet-provisioner-nfs-support' of https://github.com/mfournier/vagrant into mfournier-fix/master/puppet-provisioner-nfs-support
...
Conflicts:
CHANGELOG.md
plugins/provisioners/puppet/provisioner/puppet.rb
2013-09-01 13:32:49 -07:00
Mitchell Hashimoto
3a14d27f90
core: Arbitrary NFS options with nfs_options [GH-1029]
2013-09-01 13:08:02 -07:00
Mitchell Hashimoto
df02ddb68c
core: note backwards incompat in code
2013-09-01 12:27:15 -07:00
Mitchell Hashimoto
e5b35d1c83
core: support "mount_options" for arbitrary mount options [GH-1029]
2013-09-01 12:25:21 -07:00
Mitchell Hashimoto
2d2180e5a5
hosts/linux: fix NFS prune regex
2013-09-01 12:00:36 -07:00
Mitchell Hashimoto
a6aa16dcad
hosts/bsd: proper NFS prune sed syntax
2013-09-01 11:58:52 -07:00
Mitchell Hashimoto
65ef8d2477
Merge branch 'nfs-per-user' of https://github.com/davedevelopment/vagrant into davedevelopment-nfs-per-user
...
Conflicts:
plugins/hosts/arch/host.rb
plugins/hosts/bsd/host.rb
plugins/hosts/linux/host.rb
templates/nfs/exports.erb
templates/nfs/exports_freebsd.erb
templates/nfs/exports_linux.erb
2013-09-01 11:44:00 -07:00
Mitchell Hashimoto
c63d4fd6b8
hosts/bsd: nice error if can't read exports file [GH-2038]
2013-09-01 10:25:00 -07:00
Mitchell Hashimoto
a96efcdec9
providers/virtualbox: only set default name on first up [GH-1817]
2013-08-31 22:43:33 -07:00
Mitchell Hashimoto
9e38601f18
provisioners/puppet: run from correct working directory [GH-1967]
2013-08-31 22:24:30 -07:00
Mitchell Hashimoto
949416c76c
provisioners/ansible: use proper config name [GH-2104]
2013-08-31 21:48:41 -07:00
Mitchell Hashimoto
c4e79db552
commmands/box/remove: fix exception when no provider specified [GH-2100]
2013-08-30 09:43:35 -07:00
Mitchell Hashimoto
e5db091b1c
provisioners/salt: default bootstrap script gets latest
2013-08-29 17:40:59 -07:00
Mitchell Hashimoto
874994ff73
provisioners/salt: remove unused code
2013-08-29 17:26:52 -07:00
Mitchell Hashimoto
d154aafc0d
provisioners/salt: remove vagrant check, we core now
2013-08-29 17:08:49 -07:00
Mitchell Hashimoto
93d5182230
Merge pull request #1626 from raadad/salty-vagrant-provisioner
...
Salt provisioner.
2013-08-29 17:06:16 -07:00
Mitchell Hashimoto
c38d28f1c5
providers/virtualbox: 4.2 max network adapters to 36 [GH-1886]
2013-08-29 16:50:20 -07:00
Mitchell Hashimoto
0f4ba6dc3b
providers/virtualbox: Run post-boot after boot but before wait for SSH
...
[GH-2048]
2013-08-29 16:44:32 -07:00
Fabio Rehm
47594036b4
Add support for remote shell provisioner script
2013-08-29 20:44:14 -03:00
Mitchell Hashimoto
5a4c06f75e
core: config.ssh.timeout => config.vm.boot_timeout
2013-08-29 16:41:36 -07:00
Mitchell Hashimoto
c38fadfd2f
core: config.vm.graceful_halt_timeout to specify graceful halt timeout
2013-08-29 16:38:02 -07:00
Mitchell Hashimoto
261d0ef6cd
core: WaitForCommunicator - more robust wait for boot
...
This is a new built-in middleware that is more robust for
waiting for boots. The "max_tries" configuration is now gone, it is
timeout based. Future commits will make this even better as the
SSH communicator will implement the new "wait_for_ready" in a better
way.
2013-08-29 16:27:00 -07:00
Mitchell Hashimoto
2b7a1297c8
core: set `disabled: true` for disabling forwarded port [GH-1922]
2013-08-29 12:25:53 -07:00
Mitchell Hashimoto
c2012ff944
commands/up: flag --no-destroy-on-error [GH-2011]
2013-08-29 12:13:02 -07:00
Mitchell Hashimoto
9e476330f4
provisioners/ansible: execute ansible with cwd of root_path [GH-2051]
2013-08-29 11:55:58 -07:00
Mitchell Hashimoto
1ac3fb39fc
provisioners/chef: error if knife not found and auto-deleting
2013-08-29 11:36:37 -07:00
Mitchell Hashimoto
26b32bf8cd
provisioners/chef: don't delete node/client by default
2013-08-29 11:27:00 -07:00
Mitchell Hashimoto
a8ebd30cb9
provisioners/chef: use Subprocess to execute knife
2013-08-29 11:26:21 -07:00
Mitchell Hashimoto
d4c7e20110
core: ProvisionerCleanup task to run cleanup on provisioners
2013-08-29 11:13:43 -07:00
Mitchell Hashimoto
93c98aad01
Merge branch 'pr/1267'
...
Conflicts:
plugins/provisioners/chef/provisioner/chef_client.rb
2013-08-29 10:50:50 -07:00
Mitchell Hashimoto
50fdf1358c
communicators/ssh: handle closed connection without exception
2013-08-29 10:36:23 -07:00
Mitchell Hashimoto
54ac2e8448
Merge pull request #1713 from akalyaev/respect-nec-type-option-for-private-networks-1704
...
core: respect :nic_type option for private network. Fixes #1704
2013-08-28 22:44:20 -07:00
Mitchell Hashimoto
349b2507f9
Merge branch 'unpriv_shell' of https://github.com/frsantos/vagrant into frsantos-unpriv_shell
...
Conflicts:
plugins/provisioners/shell/config.rb
plugins/provisioners/shell/provisioner.rb
2013-08-28 22:29:49 -07:00
Mitchell Hashimoto
0e9711d0dd
kernel: config.vm.host_name works again
2013-08-28 17:17:07 -07:00
Mitchell Hashimoto
826c8a884d
Merge pull request #1801 from davegudge/patch-1
...
core: use getent to get group ID
2013-08-28 17:02:46 -07:00
Mitchell Hashimoto
adb72b07d5
plugins/provisioners: put generated inventory file in vagrantfile dir
2013-08-28 16:54:44 -07:00
Mitchell Hashimoto
8445308830
Merge branch 'generate_ansible_hosts' of https://github.com/commandtab/vagrant into commandtab-generate_ansible_hosts
...
Conflicts:
plugins/provisioners/ansible/provisioner.rb
2013-08-28 16:52:13 -07:00
Mitchell Hashimoto
8f2f654446
Merge branch 'chef_solo_environment_support' of https://github.com/marcparadise/vagrant into marcparadise-chef_solo_environment_support
...
Conflicts:
plugins/provisioners/chef/config/chef_solo.rb
2013-08-28 16:49:19 -07:00
Mitchell Hashimoto
02399a145c
provisioners/ansible: allow verbose :extra to be string
2013-08-28 16:46:04 -07:00
Mitchell Hashimoto
99a51a1ba8
Merge pull request #1979 from bmabey/patch-1
...
provisioners/ansible: adds extra verbosity option
2013-08-28 16:45:04 -07:00
Mitchell Hashimoto
5a18be1827
Merge pull request #2052 from janth/solaris11-guest
...
guests/solaris11: Added solaris11 guest plugin
2013-08-28 16:38:54 -07:00
Mitchell Hashimoto
29aab20a9d
core: nitpick the protocol forwarded port checking
2013-08-28 16:32:47 -07:00