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
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