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
8581a93e76
provisioners/chef: upload encrypted data bag secret to prov path
...
[GH-1246]
2013-11-25 15:55:00 -08:00
45e09eb677
core: allow multiple private keys [GH-907]
2013-11-25 15:45:39 -08:00
d08e3f7ab3
provisioners/puppet: use better flags for one-time run
2013-11-25 15:28:17 -08:00
4a3259443d
provisioners/puppet: make the output a bit clearer
2013-11-25 15:18:35 -08:00
e72cd9c98e
provisioners/puppet: can specify a client key/cert
2013-11-25 15:17:05 -08:00
57c25a26ad
provisioners/puppet: update config to new style
2013-11-25 15:07:12 -08:00
57d4775140
provisioners/shell: allow array args [GH-1949]
2013-11-25 13:36:51 -08:00
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
48973a72d5
commands/box/list: clean up
2013-11-25 13:26:46 -08:00
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
195f0d9639
guests/linux: emit upstart event for vagrant mounted if avail [GH-2502]
2013-11-25 11:31:15 -08:00
602505a136
providers/virtualbox: some validation around internal networks
2013-11-25 11:25:10 -08:00
2d957cdaab
providers/virtualbox: internal networks [GH-2020]
2013-11-25 11:13:46 -08:00
cc57933675
update changelog
2013-11-24 21:29:04 -08:00
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
6baab10df4
communicators/ssh: pty can be enabled
2013-11-24 16:48:07 -08:00
7ba9d2d0a0
commands/init: add --output flag [GH-1364]
2013-11-24 11:53:15 -08:00
5cbc54d570
commands/box: list has machine-readable output
2013-11-24 11:42:24 -08:00
15d639c8dc
website: document machine-readable output
2013-11-24 11:37:57 -08:00
42a71a953d
commands/status: add machine-readable output
2013-11-24 11:11:38 -08:00
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
f66d08d73c
commands/plugin: style nitpick
2013-11-23 16:45:45 -08:00
63005fc1c6
Merge pull request #2420 from tmacedo/rubygems_2_compatibility
...
core: compatibility with rubygems 2.x
2013-11-23 16:44:10 -08:00
c8be50c69e
providers/virtualbox: get rid of some 4.3 global state
2013-11-23 16:30:09 -08:00
2044c7445e
Merge pull request #2484 from andyfowler/virtualbox-parallel-import
...
provider/virtualbox: virtualbox parallel box import
2013-11-23 16:23:07 -08:00
cfe17076b5
providers/virtualbox: nitpick on style
2013-11-23 16:16:45 -08:00
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
b65b22cef2
update changelog
2013-11-23 16:05:44 -08:00
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
46d9ded812
commands/box/add: add --clean flag to ignore continuation
2013-11-23 15:55:52 -08:00
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
97389d4255
core: output synopsis with command [GH-2249]
2013-11-23 14:00:42 -08:00
23bdbd6fd8
synced_folders/nfs: specify nfs_udp false to disable udp [GH-2304]
2013-11-23 13:43:48 -08:00
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
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
aed61291e8
Update CHANGELOG
2013-11-23 11:45:06 -08:00
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
5b71cf87f3
Merge pull request #2450 from onejli/master
...
guests/redhat: ifdown ethN before munging ifcfg-ethN
2013-11-23 11:40:02 -08:00
05e9dc6e59
Update CHANGELOG
2013-11-23 11:36:20 -08:00
dcf57bd2cc
guests/linux: increase sleep time btween NFS mount retries
2013-11-23 11:35:27 -08:00
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
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
c00b045f53
providers/virtualbox: retry suspended check [GH-2479]
2013-11-23 11:20:22 -08:00
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
0425d1712b
synced_folders/nfs: config goes here
2013-11-23 10:49:51 -08:00
2c8b6ace7f
providers/virtualbox: output UI
2013-11-22 19:33:17 -08:00
803e78a5d4
fixing error in comment #2333
2013-11-23 10:18:59 +08:00
0b9861db7d
providers/virtualbox: fix broken NFS check
2013-11-22 17:29:35 -08:00
850c9ea7a6
kernel: handle new NFS types
2013-11-22 17:22:47 -08:00
22a5430068
synced_folders/nfs: use proper error classes
2013-11-22 17:18:08 -08:00
be6d4cc116
providers/virtualbox: make sure sf host paths are strings
2013-11-22 17:16:21 -08:00
35ac7da5a0
providers/virtualbox: don't use NFS middleware anymore
2013-11-22 17:13:53 -08:00
52fe93cc41
synced_folders/nfs: begin implementation (not functional)
2013-11-22 16:51:55 -08:00
9d3818a380
providers/virtualbox: use new SyncedFolders middleware
2013-11-22 16:21:14 -08:00
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
a80de51054
Fixes recommended by phinze for #2333
2013-11-22 11:55:17 +08:00
97148379d2
providers/virtualbox: implement the synced folder plugin
2013-11-21 17:38:17 -08:00
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
31894171d3
Make salt bootstrap work on systems without python
2013-11-21 10:42:06 -05:00
4225b0eb7b
provider/virtualbox: fix bad constant reference in dhcp error
...
refs #2454
2013-11-20 11:15:25 -06:00
722e9e6afb
[Provisioner][Shell] add keep_color option to allow custom color output
2013-11-16 13:34:58 +01:00
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
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
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
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
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
1ad756d52c
ifdown ethN before munging ifcfg-ethN (i.e. removing previous vagrant config for network interface)
2013-11-02 12:35:37 -07:00
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
2073a1a939
Fix hostname setting also in Debian, part N
...
Port #2384 / #2383 for Debian guests.
2013-10-31 21:39:45 -03:00
48875124b9
commands/box: Read box URL and downloaded date from JSON
2013-10-29 13:09:24 -02:00
05a8cf523a
core: Get rid of code that deals with box info on a separate statefile
2013-10-29 13:09:24 -02:00
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
cbc7e7eedb
commands/box: Preparing to display additional box information on `box list`
2013-10-29 13:09:23 -02:00
031119a858
commands/box: Extract a base class for dealing with StateFile instantiation
2013-10-29 13:09:23 -02:00
1c689d2211
core: Remove box information from state file after box removal
2013-10-29 13:09:23 -02:00
e4b5db829e
commands/box: Extract box removal code from `box remove` command into a builtin action
2013-10-29 13:09:23 -02:00
17fd5f9e4e
commands/box: Introduce a StateFile for keeping track of downloaded boxes
2013-10-29 13:09:23 -02:00
3368ef610a
Add shortcut for setting the memory size for VirtualBox VM
2013-10-28 00:43:33 -03:00
2d66d94ebe
compatibility with rubygems 2.x
2013-10-25 11:27:17 +02:00
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
af66984ca1
Merge pull request #2404 from canausa/patch-1
...
commands/provision: add --no-parallel
2013-10-23 23:13:04 -07:00
889233ed94
Automatically enable symlinks on vboxsf for VirtualBox 4.1 (see #713 and 387692f9c8).
2013-10-23 23:00:07 +02:00
10883b3be6
Add --no-parallel to provision
2013-10-21 10:19:42 -04:00
c0eb9bd35a
fix nfs mount fail with freebsd.
2013-10-21 08:42:57 +09:00
9c8ead1ca3
Restore correct pathing
2013-10-17 22:45:23 -04:00
ebb85b57fd
Allow owner & group to be supplied as an Integer and skip lookup
2013-10-17 22:40:21 -04:00
673a06b54d
hosts/gentoo: use subprocess machinery
...
/cc @timgus
2013-10-17 08:32:09 -10:00
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
0c238741d3
Fixing so localhost hosts file entry is not lost when updating hostname. Addresses Issue #2383 .
2013-10-17 12:56:59 -04:00
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
b2070eec53
providers/virtualbox: Support VirtualBox 4.3 [GH-2374]
2013-10-15 11:42:22 -10:00
330f72eae2
Fix hostname setting also in Debian
...
Same fix as #2334 .
2013-10-15 15:57:40 -03:00
535eb35206
Use old name instead of hard coded 'precise64'
2013-10-15 15:57:15 -03:00
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
2be01284ea
provisioners/chef: fix exception during node cleanup [GH-2345]
2013-10-14 17:12:49 -10:00
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
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
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
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
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
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
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
6c9edbbdc6
guests/esxi: Add support for VMware ESXi guests
2013-10-08 21:47:32 -07:00
157a7081ba
Update boundary usage in the sed regexp to update the hosts file
2013-10-08 20:14:22 -04:00
06aaa6e6ea
#2333 , more fixes - right order to get fqdn right
2013-10-08 17:53:27 +08:00
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
9ca6fbe8f4
Hostname and FQDN should be done in one line
2013-10-06 15:33:00 +08:00
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
4049fd136f
Merge pull request #2329 from mpioli/redhat
...
guests/redhat: create from fedora guest (migrate)
2013-10-05 11:43:42 -07:00
e9903422cc
detect Red Hat Enterprise Linux 4 and Oracle Linux
2013-10-05 18:01:27 +01:00
b16d56c717
rename host plugin (fedora to redhat)
2013-10-05 17:40:23 +01:00
d1871b5c15
do not use systemd on current versions of CentOS or RHEL
2013-10-05 17:33:13 +01:00
b514f0c321
remove extra alias for vvv verbosity
2013-10-04 15:32:10 -04:00
e5a2f1e8b7
fix ansible-playbook runs when verbosity is not specified
2013-10-04 02:58:49 -04:00
852812f778
Adding overstate support to the salt provisioner
2013-10-03 15:28:35 -04:00
4f1a65f74b
fixing default verbosity
2013-10-02 02:28:55 +00:00
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
9fcc89bcf1
provisioners/chef: use real variable in delete from chef sever [GH-2300]
2013-10-01 14:13:16 -07:00
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
4f11716633
Remove old /tmp/bootstrap_salt.sh before uploading as it may not be writeable
2013-09-29 21:05:59 +10:00
c51952a68d
Resolving #2194 (Ansible buffering output if run as subprocess)
2013-09-26 10:13:44 +01:00
ecb6ebaf81
add cfengine provisioner suse install support
2013-09-25 20:29:25 -05:00
d970c4e03f
Merge pull request #2254 from Caustic/fix-hostname-debian
...
guests/debian,ubuntu: Fixed fqdn handling
2013-09-25 10:36:33 -07:00
c1228ae206
Allow to change the DHCP_HOSTNAME on RedHat
2013-09-24 23:48:10 +02:00
33dd881ad7
provisioners/chef: disable color if Vagrant has no color [GH-2246]
2013-09-22 14:15:55 -05:00
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
e65ac705b4
fixed missing backtick
2013-09-21 21:41:06 -05:00
36bd52713b
provisioners/ansible: convert extra vars to strings [GH-2244]
2013-09-20 21:16:50 -07:00
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
79fa7000fa
providers/virtualbox: don't touch DYLD_* anymore.
...
Subprocess handles this
2013-09-20 17:57:44 -07:00
4d03a7359e
guests/linux: fail after a number of attempts
2013-09-20 17:52:36 -07:00
62e357ffcd
guests/linux: only successful mount if exit status 0
2013-09-20 17:50:29 -07:00
8c4ea4f47b
Update CHANGELOG
2013-09-20 17:24:59 -07:00
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
cd79563837
#2241 moved chmod up before verify_shared_folders check
2013-09-19 14:26:35 -04:00
b20fe8d41e
Dont replace Windows newlines to Unix if shell is set as binary
2013-09-19 13:33:58 +02:00
8fd2337038
Fix invocation of initialize
...
Fixes #2229 for me
2013-09-19 11:55:46 +02:00
f9e4ea9ce8
communicators/ssh: timeout waiting for connection + header [GH-2226]
2013-09-18 09:32:30 -07:00
8cc5b4ddb5
hosts/arch: remove duplication with HostsLinux
2013-09-16 21:27:15 -07:00
ee9fc00a04
provisioners/ansible: default output level is verbose [GH-2194]
2013-09-16 21:02:22 -07:00
b9801f44a0
guests/linux: try `id -g` to determine group as well [GH-2197]
2013-09-16 20:51:09 -07:00
93f2e9ebbb
communicators/ssh: increase conect timeout [GH-2163]
2013-09-15 17:37:40 -07:00
5e468dd110
core: Convert FP ports to ints [GH-2173]
2013-09-15 17:29:49 -07:00
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
a36f06f28f
Update CHANGELOG
2013-09-15 16:39:54 -07:00
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
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
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
131ce4fc97
add ansible.host_key_checking configuration parameter
2013-09-13 22:48:12 -04:00
Mitchell Hashimoto
phinze
elliotsegler
Mark Peek
Daniel Miller
jaugustin
Rudolf Leermakers
Andy Fowler
Scott Moyer
Jonathan Li
rimckenn
Teemu Matilainen
Fabio Rehm
Tiago Macedo
Stephan Meissl
canausa
Heikichi Umehara
Evan Borgstrom
Nathan Mische
Tim Gus
Gilles Cornu
Tomdarkness
viq
Sam Gronblom
Doug MacEachern
Laurent Raufaste
Elliot Segler
Matthew
Matthew Johnson
Jeff Singer
egghead
Ian Heggie
jabclab
U-quartz\Cory
François Charlier
Alan Braithwaite
Pete Michaud
Ben Tse
Alexander Norström
keyist
Jurnell Cockhren