Commit graph

423 commits

Author SHA1 Message Date
Kristof Willaert
6b5c00089d Make MAC address regex check case insensitive
The regex check for the container MAC address presence in the
dnsmasq leases file is case sensitive. Dnsmasq outputs uppercase
addresses in the leases file.

As MAC addresses are generally considered case insensitive, it
makes sense to relax the regular expression check to allow for this.
2014-05-08 14:30:14 +02:00
Fabio Rehm
5eef1524d7 driver: Use relative guest paths for synced folders
Closes GH-258
2014-05-04 20:52:00 -03:00
Fabio Rehm
856a847bc8 config: Switch default backingstore to "best" [GH-277] 2014-05-04 20:37:09 -03:00
Fabio Rehm
4c3143aa34 Merge branch 'backingstore_options' of https://github.com/tailhook/vagrant-lxc
Conflicts:
	lib/vagrant-lxc/config.rb
2014-05-03 23:42:39 -03:00
Fabio Rehm
7870d59184 Merge branch 'fix_mounts' of https://github.com/tailhook/vagrant-lxc 2014-05-03 23:36:23 -03:00
Fabio Rehm
a0fe2f9cf0 action/clear_forwarded_ports: Fix privileged port detection and simplify code [GH-259] 2014-05-03 23:28:59 -03:00
Fabio Rehm
84bdb5cb22 Fix code indentation 2014-05-03 23:28:04 -03:00
Fabio Rehm
ee63d2b2ae Merge branch 'sudo-for-redir' of https://github.com/guerremdq/vagrant-lxc 2014-05-03 23:14:29 -03:00
guerremdq
0b1fffc6e3 clean redir pid with sudo only if port is < than 1024 2014-04-29 00:02:16 -03:00
Cam Cope
a9248cb697 add backingstore parameters 2014-04-28 17:17:59 +03:00
Eric Hartmann
3b311ad840 Fix sudoers for multiple users 2014-04-23 17:49:04 +02:00
Eric Hartmann
2666f9e38d Fix argument parsing 2014-04-23 16:27:33 +02:00
Jef Mathiot
0eae5c0926 Removed unsecure calls to SudoWrapper#su_c. 2014-04-17 12:56:56 +02:00
Jef Mathiot
94e175dc07 sudoers command now creates a safe wrapper script.
Sudoers now creates a safe wrapper script that performs sanity checks on sudo :
* wrapper generated in /usr/local/bin (name includes version to allow multiple wrappers on the same system)
* sudoers command now generates a one-line file in /etc/sudoers.d
* SudoWrapper use the new wrapper
* Removed unused Config#validate method
2014-04-09 15:53:20 +02:00
Paul Colomiets
9f9cb1c791 Implement sorting of synced_folders
It's useful if you want to mount something inside /vagrant or if you
have some another mount in some synced folder.

This piece of code is extracted from virtualbox driver.
2014-04-09 16:16:56 +03:00
Fabio Rehm
47cf361b98 Up dev version 2014-04-06 18:52:19 -03:00
Fabio Rehm
bc6e2e9d7c v1.0.0.alpha.1 2014-04-04 16:28:57 -03:00
Fabio Rehm
7e9d790f6a command/sudoers: Minor tweaks to make the generated file work with latest changes 2014-03-27 20:04:38 -03:00
Fabio Rehm
328477172e command/sudoers: Add missing -p to mkdir command 2014-03-24 23:50:38 -03:00
guerremdq
697d8bde08 only use sudo with redir when port number is lower than 1024 2014-03-23 13:39:42 -03:00
Jef Mathiot
5a56b72360 * Ruby >1.9 hash syntax
* Improved comment on Vagrant::Registry.keys
2014-03-22 00:58:36 +01:00
Fabio Rehm
8b1573c536 doc: Let everyone know about the new vagrant lxc sudoers command 2014-03-21 20:04:35 -03:00
Fabio Rehm
64de0fca3c command/sudoers: Mention what is the default value for the user and add a REFACTOR note 2014-03-21 19:53:49 -03:00
Fabio Rehm
02fefd10c0 command/sudoers: Nitpick
* Use Ruby 1.9+ hash syntax
* Use % as the BOXES placeholder as it is the same symbol used for I18n placeholders as well
2014-03-21 19:48:36 -03:00
Fabio Rehm
19bccc9ca5 ✂️ whitespace 2014-03-21 19:38:56 -03:00
Fabio Rehm
b7dbfc84af Merge branch 'master' of github.com:jefmathiot/vagrant-lxc
Conflicts:
	lib/vagrant-lxc/plugin.rb
2014-03-21 19:38:35 -03:00
Fabio Rehm
41716e9100 synced_folder: Fix UI warn when group / owner are specified on Vagrantfile 2014-03-21 19:31:14 -03:00
Fabio Rehm
164afc7839 package: Nicely handle optional lxc-template on base boxes when packaging 2014-03-21 19:30:28 -03:00
guerremdq
fd948f8552 Add sudo for redir 2014-03-20 17:01:45 -03:00
Jef Mathiot
8590c87132 Created an "lxc sudoers" command to create sudoers file for a given user (defaults to current one). 2014-03-16 18:59:18 +01:00
Fabio Rehm
4f49be03ad core: Make lxc-template optional [GH-254] 2014-03-14 00:32:03 -03:00
Fabio Rehm
da96e8c1a4 synced_folder: Fix mount_options on Vagrant 1.4+ 2014-03-14 00:21:21 -03:00
Fabio Rehm
d6a22c9f88 synced_folder: Warn in case :group or :owner are specified [GH-196] 2014-03-13 23:48:46 -03:00
Fabio Rehm
20d4547044 synced_folder: Support for mount_options 2014-03-13 23:36:15 -03:00
Fabio Rehm
c9fe9e552e Merge branch 'master' of github.com:vorlock/vagrant-lxc 2014-03-13 23:07:55 -03:00
Fabio Rehm
ad63452651 Nitpick 2014-03-13 23:07:05 -03:00
Fabio Rehm
5df28390e2 Merge branch 'utsname-hostname' of github.com:fpletz/vagrant-lxc 2014-03-13 23:05:47 -03:00
Fabio Rehm
dfd93d087c action: Keep old behavior of erroring on vagrant ssh -c instead of just showing a message 2014-03-13 23:02:18 -03:00
Franz Pletz
be12f11ced Set container utsname to configured hostname per default
Previously, the utsname of a machine was set to the vagrant machine ID.
As the utsname represents the hostname of the machine and is independent
from the name of the actual LXC container, the hostname that was
specified in the Vagrantfile should be used instead. If no hostname is
provided, the machine ID will be used like before.

Additionally, this will trigger the DHCP client in the container to send
the correct hostname to the DHCP server on the first request at boot.
Vagrant sets the configured hostname only after the network is up. If
for example automatic DNS updates are configured, the right DNS record
will be created every time.
2014-03-13 19:06:05 +01:00
Fabio Rehm
7e79d59365 core: Fix vagrant ssh [GH-252] 2014-03-13 09:42:39 -03:00
Marcin Kulisz
e84f9e2b4a Added dnsmasq leases file location for libvirt 2014-03-13 09:49:24 +00:00
Fabio Rehm
14430908f8 🤘 Yeah baby, we are getting to 1.0 🤘 2014-03-13 00:57:37 -03:00
Fabio Rehm
38ae9441fc package: lxc-config should be included when repackaging boxes 2014-03-13 00:57:37 -03:00
Fabio Rehm
61002b9bb8 core: Remove actions that check for containers statuses 2014-03-13 00:57:37 -03:00
Fabio Rehm
803e446dc5 backports: Add IsState 2014-03-13 00:57:37 -03:00
Fabio Rehm
71b02ab511 We dont need to provide support for all versions on the 1.1.x series ;) 2014-03-13 00:57:37 -03:00
Fabio Rehm
9288d1e56c core: Enable paralelization for Vagrant 1.2+ only 2014-03-13 00:57:37 -03:00
Fabio Rehm
fb58d6c878 core: Get the plugin to work on Vagrant 1.4 nicely 2014-03-13 00:57:37 -03:00
Fabio Rehm
23e82594e1 backports: Add Action::Message 2014-03-13 00:57:36 -03:00
Fabio Rehm
5c6855eb4c backports: Alias HandleBoxUrl to HandleBox 2014-03-13 00:57:36 -03:00
Fabio Rehm
f2c1f70cc7 backports: Alias 1.5 new Vagrant::UI::Interface methods 2014-03-13 00:57:36 -03:00
Fabio Rehm
35feb11367 core: Fix synced folder creation (AKA first bug caught with vagrant-spec)
Thanks @mitchellh!
2014-03-13 00:57:36 -03:00
Fabio Rehm
320a698f49 backports: Make it clear that it will only be extracted to a separate gem if theres enough interest 2014-03-13 00:57:36 -03:00
Fabio Rehm
bb8514b518 core: "Tag" ShareFolders action as backport functionality 2014-03-13 00:57:36 -03:00
Fabio Rehm
d5abb523de core: Implement support for built in synced folders and add required logic for NFS 2014-03-13 00:57:36 -03:00
Fabio Rehm
056e47d364 core: Introduce a public_address capability so that we can use vagrant share 2014-03-13 00:57:36 -03:00
Fabio Rehm
8f1b54395e core: Introduce a synced folder plugin for vagrant 1.4+ 2014-03-13 00:57:36 -03:00
Fabio Rehm
a0acc571b2 core: Use HandleBox in case Vagrant 1.5 is in use 2014-03-13 00:57:36 -03:00
Fabio Rehm
891403f10d backports: Add files for Vagrant 1.5 actions that will need to be backported 2014-03-13 00:57:36 -03:00
Fabio Rehm
4fbd7c0182 core: Move WaitForCommunicator to backports and make it generic 2014-03-13 00:57:36 -03:00
Fabio Rehm
f5661280bc core: Kick off a vagrant-backports lib with method for verifying vagrant version 2014-03-13 00:57:36 -03:00
Fabio Rehm
1072a42ed2 revert 2014-03-13 00:57:36 -03:00
Fabio Rehm
deac5930cc action/handle_box_metadata: Implement support for 1.0.0 base boxes 2014-03-09 21:21:39 -03:00
Fabio Rehm
4a84d95ff2 Up dev version 2014-02-26 22:01:29 -03:00
Fabio Rehm
39a5946399 v0.8.0 2014-02-25 23:59:13 -03:00
Fabio Rehm
f8021b3f31 Merge pull request #225 from ccope/name-cleanup
remove naming cruft, clarify comment
2014-02-19 23:25:59 -03:00
Cam Cope
b5c7a50a74 match hwaddr lines with varying spaces 2014-02-19 18:25:45 -05:00
Cam Cope
186b01e192 remove naming cruft, clarify comment
Removed confusing leftover "use_machine_name" variable
Made comment about :container_name more clear
2014-02-18 03:05:14 -05:00
Fabio Rehm
005140099c Check for whether lxc is installed using lxc-create
Closes GH-214 and GH-211
2014-02-12 01:41:55 -02:00
Fabio Rehm
95e111c322 Merge branch 'master' of https://github.com/hiono/vagrant-lxc into next
Conflicts:
	lib/vagrant-lxc/driver/cli.rb
2014-02-02 19:50:58 -02:00
Fabio Rehm
5db318d26f Merge branch 'fixes' of https://github.com/attilabogar/vagrant-lxc into next 2014-02-02 19:49:24 -02:00
Fabio Rehm
6e7ab85dad Use a safer random name for containers (closes GH-192)
if the same vagrantfile is up'd in the same second in the same basedir
this caused a conflict
2014-02-02 19:43:51 -02:00
Fabio Rehm
7e00b96520 Show something meaningful to the user in case the container already exists [GH-132] 2014-02-02 19:27:08 -02:00
Fabio Rehm
786bb8a3fe Simplify code related to container naming [GH-132] 2014-02-02 18:37:06 -02:00
Fabio Rehm
2be86bb7d0 Up version for dev 2014-02-02 18:07:50 -02:00
Michael Owings
b34dd7d8e7 Allow two ways to name a container 2014-02-02 18:03:33 -02:00
Cam Cope
ffb573a7f1 allow setting the container name in the vagrantfile 2014-02-02 18:03:33 -02:00
Hiro
a436e30214 fixed, case insensitive matching
lxc version: 1.0.0.alpha3
$ sudo lxc-info -n test_default-1387877096
Name:           test_default-1387877096
State:          RUNNING
....
2013-12-24 18:35:19 +09:00
Fabio Rehm
6066d22ad9 Simplify check for whether lxc is installed [GH-186] 2013-12-17 22:59:32 -02:00
Attila Bogár
d8a8dbaa9b fix long waiting time with centos 6.4 containers on ubuntu 13.10 host 2013-11-19 22:24:36 +00:00
Attila Bogár
e4e4551aea fix incompatibility issue with ppa:ubuntu-lxc/stable and ppa:ubuntu-lxc/daily 2013-11-19 22:23:25 +00:00
Jan Vansteenkiste
9b7491c2e8 Attempt to find the lxc-version command using sudo
... if lxc-version is not found in the efault PATH

Fixes #195
2013-11-12 13:38:50 +01:00
Fabio Rehm
6779556650 Add a TODO so that we can easily grep this 2013-11-11 20:44:02 -02:00
Fabio Rehm
324cddcb9d Bring back @gwillem comment from 2790261e58 regarding rootfs paths so we know what this "./." is about :) 2013-11-11 20:42:34 -02:00
Fabio Rehm
6cba594f44 Up version for dev 2013-11-08 18:57:07 -02:00
Fabio Rehm
61f7b73f2a v0.7.0 2013-11-08 18:54:33 -02:00
Fabio Rehm
3215b99534 What we have in place is already enough for us to bump to 0.7.0 2013-11-06 21:42:59 -02:00
Fabio Rehm
afd302529c Enable parallelization [GH-152] 2013-11-06 21:40:32 -02:00
Fabio Rehm
b86b83eba1 Fix WarnNetworks action [GH-154] 2013-11-06 21:21:16 -02:00
Fabio Rehm
0e57cfc2b0 Remove unneeded .to_s 2013-11-06 21:06:25 -02:00
Fabio Rehm
bf6e4b5c89 Respect Vagrantfile options to disable forwarded port
Closes GH-149
2013-11-06 21:01:21 -02:00
Fabio Rehm
6b5db24a6b Better than a note on the readme is a warning for users about unsupported private / public networks :)
Closes GH-154
2013-11-06 20:40:08 -02:00
Fabio Rehm
c61ade8ef4 Nicely handle nil values for :host_ip when specifying forwarded ports
Fix GH-170
2013-11-06 20:25:46 -02:00
Fabio Rehm
c8f379c764 Fix various issues related to recent default permissions changes to /var/lib/lxc [GH-180] 2013-11-06 19:38:48 -02:00
Fabio Rehm
1c5c73b08a Fix sudo wrapper logger name 2013-11-06 01:10:40 -02:00
Willem de Groot
2790261e58 included rootfs_path variable in tar command 2013-11-05 19:55:41 +01:00
Willem de Groot
f52835cb58 Fix relative path issue used for vagrant package 2013-10-30 12:01:51 +01:00
Fabio Rehm
b5f21f268a Up version for dev 2013-10-27 22:19:27 -02:00
Fabio Rehm
5a6b2791e4 v0.6.4 2013-10-27 22:18:08 -02:00
Fabio Rehm
2b062487bc Hack in a fix for hosts that do not have lxc-shutdown around [GH-150] 2013-10-24 11:47:15 -02:00
Vokhmin Alexey V
3375a9c40c small refactoring, added scripts for Openmandriva 2013-10-21 23:11:43 +04:00
Fabio Rehm
225af56227 Up version for dev 2013-10-12 17:03:26 -03:00
Fabio Rehm
a9d7dff53a v0.6.3 2013-10-12 17:01:49 -03:00
Vokhmin Alexey V
39515cc1da #157: small refactoring, updated specs 2013-10-12 02:15:12 +04:00
Vokhmin Alexey V
c5a89a54ce #157: Fixed: FetchIpFromDnsmasqLeases returns [] 2013-10-12 02:04:29 +04:00
Fabio Rehm
23e25c40ab Copy & paste is evil 2013-10-10 12:55:06 -03:00
Guilhem Lettron
bdedae40b2 Respect Vagrantfile options to disable synced folders
fix #147
2013-10-10 11:53:10 +02:00
Fabio Rehm
79006095f5 Remove extra if 2013-10-03 13:35:17 -03:00
Fabio Rehm
0f1239a1e3 Bump dev version 2013-10-03 13:34:55 -03:00
Fabio Rehm
b928aa8901 v0.6.2 2013-10-03 13:28:38 -03:00
Fabio Rehm
c194b3a24a Fix lxc-attach --namespaces support detection and cache the result 2013-10-03 13:26:04 -03:00
Fabio Rehm
8bcb8b5328 Bumb dev version 2013-10-03 12:31:15 -03:00
Fabio Rehm
79aa4d8866 v0.6.1 2013-10-03 12:25:41 -03:00
Fabio Rehm
f9dd5392ff Improve checking for support for fetching IP with lxc-attach [GH-118] 2013-09-28 22:37:31 -03:00
Fabio Rehm
175c40765a Fall back to dnsmasq leases file if not able to fetch IP with lxc-attach
Closes GH-118
2013-09-28 03:12:58 -03:00
Fabio Rehm
18bb9482d5 Nicely handles missing templates path (fixes GH-139) 2013-09-28 02:58:38 -03:00
Fabio Rehm
a6c95bff50 Format code 2013-09-28 01:46:27 -03:00
Fabio Rehm
ecc862f6cb Log container's mac address to ease debugging 2013-09-28 01:46:26 -03:00
Fabio Rehm
bcfb7b3e00 Moar annotations 2013-09-28 01:46:26 -03:00
Fabio Rehm
2e5e5920d7 Shortcuts! 2013-09-28 01:05:10 -03:00
Fabio Rehm
2116737989 Dont worry about machine state when waiting for communicator [GH-142] [GH-146] 2013-09-27 12:27:25 -03:00
Fabio Rehm
6680858184 Improve logging and add some TODOs that have been around for a while 2013-09-21 01:32:15 -03:00
Fabio Rehm
d02a9d575f Ensures lxc templates are executable prior to running lxc-create
Closes #128
2013-09-21 01:28:03 -03:00
Fabio Rehm
4eb066a076 v0.6.0 2013-09-12 12:32:02 -03:00
Fabio Rehm
cf73a843d0 Do not worry about transition to running state when starting a container, this is handled from outside 2013-09-12 01:12:07 -03:00
Fabio Rehm
791a93fe9e Make use of the new WaitForCommunicator action on boot 2013-09-12 01:10:11 -03:00
Fabio Rehm
1da7b60cd8 "Backport" vagrant 1.3+ WaitForCommunicator action 2013-09-11 22:33:22 -03:00
Fabio Rehm
f13806626c Use vagrant 1.3+ ProvisionerCleanup builtin action on destroy 2013-09-11 22:10:18 -03:00
Fabio Rehm
7f3f7b1558 Rename plugin name to vagrant-lxc so that it is easier to check if it is installed with Vagrant.has_plugin? 2013-09-11 21:16:57 -03:00
Oliver Matthews
e5790d3ad1 use uid/gid for chowns. 2013-09-10 20:57:51 +01:00
Holger Amann
5c53e52ea1 container's / must be compressed under 'rootfs' dir 2013-08-30 19:23:31 -03:00
Holger Amann
280702061d fix creating rootfs.tar.gz 2013-08-11 15:30:23 +02:00
Fabio Rehm
5eaf0a26bf Up version for development 2013-08-01 19:19:17 -03:00
Fabio Rehm
e615c55ad4 v0.5.0
[ci skip]
2013-08-01 19:13:46 -03:00
Fabio Rehm
b5378c7c42 Add support for reading from Ubuntu's default /var/lib/misc/dnsmasq.lxcbr0.leases 2013-07-31 23:01:08 -03:00
Fabio Rehm
1ef2c5bcad Simplify dnsmasq leases lookup 2013-07-31 23:00:35 -03:00
Fabio Rehm
4bb70fb252 Moar debugging when trying to fetch the IP from dnsmasq leases 2013-07-31 23:00:20 -03:00
Fabio Rehm
2082a5a81d Remove some unused args and add pending specs so that we don't forget to test it 2013-07-31 22:35:49 -03:00
Fabio Rehm
5f102d3e10 First stab at persisting lxc customizations on config file instead of using lxc-start "-s" parameter 2013-07-29 12:12:41 -03:00
Fabio Rehm
251fe68035 Cache the output of Driver#version 2013-07-29 12:10:59 -03:00
Fabio Rehm
23f531b38c Remove duplicated Driver#base_path method 2013-07-29 12:10:25 -03:00
Fabio Rehm
0385a64d31 Replace ugly driver builder with a more intelligent approach
References #118
2013-07-29 12:08:24 -03:00
Fabio Rehm
97f6edeed8 Error out if LXC is not installed
This is enough to close #11
2013-07-28 02:55:00 -03:00
Fabio Rehm
dee099ce96 Make use of vagrant's builtin action for handling forwarded port collisions
Closes #5
2013-07-28 02:39:11 -03:00
Fabio Rehm
7f58f7a26e Add support for logging redir output by setting REDIR_LOG env var
Closes #51
2013-07-28 02:30:17 -03:00
Fabio Rehm
14e8c41ee0 Avoid sudos for redir related stuff 2013-07-28 02:20:16 -03:00
Fabio Rehm
d62a053674 Add support for using a sudo wrapper script
Closes #90
2013-07-28 02:17:07 -03:00
Fabio Rehm
98f1df47a1 Do not attach forwarded ports to host's 127.0.0.1 by default
This is enough for us to bump to 0.5.0 and to close #76
2013-07-28 01:31:50 -03:00
Fabio Rehm
2dbfd23915 No need to use sudo to check if redir is installed 2013-07-27 20:44:36 -03:00
Fabio Rehm
681c490cdc Add Vagrantfile VM name to the container name
Closes #115
2013-07-21 22:46:44 -03:00