Commit Graph

226 Commits

Author SHA1 Message Date
Bryan Cribbs 9bc81fc318 Merge branch 'sevos-enable_using_private_ips_from_aws' 2013-11-15 20:17:14 -06:00
Bryan Cribbs 3abecb0088 Merge sevos pull/15 into master
Merge branch 'enable_using_private_ips_from_aws' of
https://github.com/sevos/vagrant-hostmanager into master.

Conflicts:
	lib/vagrant-hostmanager/config.rb
	lib/vagrant-hostmanager/hosts_file.rb
2013-11-15 20:15:10 -06:00
Bryan Cribbs cac3589451 Merge pull request #46 from emyl/provider-to-sym
Properly convert provider command option to symbol
2013-11-15 17:08:47 -08:00
Bryan Cribbs 6c5f3ed972 Merge pull request #45 from bdcribbs/fix/44
Handle destroyed machines in update_file.  Fixes #44
2013-11-15 16:13:38 -08:00
Tim Brown 8f3dd06d8e Use :SystemRoot to detect Windows, including git-bash. Also use :Windir to ensure we get correct hosts file path 2013-11-11 14:10:11 -08:00
Emiliano Ticci 2a6cf09b1d Properly convert provider command option to symbol 2013-11-04 17:19:29 +01:00
Bryan Cribbs c53452b927 #44 Handle destroyed machines in update_file
Keep track of machines that have been destroyed (they have a nil id).
Do not include them when updating the hosts file.

Since it is impossible to match on id, this is accomplished by matching
the exact ip / hostname / alias.  If any of these have been altered
since the entry was created the entry will not be removed from the hosts
file.

Potentially, this could be relaxed to only match on ip / hostname pairs.
2013-11-02 16:00:23 -05:00
Shawn Dahlen 5e785f819d Bump for release 2013-10-04 10:05:11 -04:00
Shawn Dahlen 0b3b8ae2e7 Merge pull request #41 from robcoward/master
Added support for windows guests
2013-10-04 07:04:05 -07:00
Rob Coward b935e4002f Changed test for windows guest to use the same as the vagrant-windows plugin 2013-10-03 14:51:49 +01:00
Rob Coward c555a98de3 Added support for windows guests 2013-10-03 14:16:53 +01:00
Shawn Dahlen 4e198ed65d Bump for release 2013-10-02 07:42:51 -04:00
Shawn Dahlen d7f6941303 Merge pull request #40 from cliles-capario/solaris-support
Support Solaris hostfile in /etc/inet/hosts
2013-10-02 04:41:50 -07:00
Chris Liles b281681b11 adding solairs support 2013-10-01 13:17:18 -07:00
Shawn Dahlen 86f4d73387 Bump version for release. 2013-09-09 17:53:34 -04:00
Shawn Dahlen 58d47cfb8f Merge pull request #38 from mosaicxm/feature/current-vagrantfile-updates
only remove lines for the current vagrantfile
2013-09-09 14:52:06 -07:00
S. Brent Faulkner cb9832a399 only remove lines for the current vagrantfile 2013-09-03 15:32:54 -04:00
Shawn Dahlen 3054b2d98b Merge pull request #36 from itaymendel/master
fixed windows compatibility issues for the hosts file
2013-08-29 05:56:59 -07:00
itaymendel 1d161d0582 fixed windows compatibility issues for the hosts file
i have added a 'if windows' for the update_host method, to deal with a windows host machine.
sometimes i had an error on line 17, because the file was no longer there (maybe mv removed it?), so i just added a exception block to catch it. it does nothing, but now it is working for me.
2013-08-28 08:58:46 +03:00
Shawn Dahlen 436b171f53 Remove suspend, resume, and halt hooks.
This commits removes hooks that introduced dependencies to machine state
and therefore broke compatibility with all Vagrant providers.
2013-08-22 17:12:33 -04:00
Shawn Dahlen 4136b1ee7b Merge pull request #35 from jeremiahsnapp/check_global_enabled
Check global.enabled instead of machine.enabled
2013-08-22 13:46:19 -07:00
Shawn Dahlen f189fb68cf Fix hardcoding of active state.
This commit queries the environment for active machines instead of
relying on a certain machine state. This fixes support for other Vagrant
providers.
2013-08-22 16:45:39 -04:00
Shawn Dahlen f3e2708144 Bump for release. 2013-08-15 11:19:38 -04:00
Shawn Dahlen 2f1e3e0b63 Merge pull request #34 from jeremiahsnapp/define_active_as_running
Add hooks & define active/offline as running/not
2013-08-15 08:15:51 -07:00
Jeremiah Snapp f8baff2186 Check global.enabled instead of machine.enabled
update_all.rb checks if @machine.config.hostmanager.enabled is set to true.
The default value of @enabled is set to false by config.rb.
If the Vagrantfile has a global value of true for enabled but it sets vm
specific hostmanager options, such as when specifying hostmanager.aliases,
then the @machine.config.hostmanager.enabled will default to false and
hostmanager will not think it is enabled.

Check @global_env.config_global.hostmanager.enabled instead.
2013-08-12 17:41:38 -04:00
Jeremiah Snapp 1cb7fc9b57 Add hooks & define active/offline as running/not
Hosts entries shouldn't only be added/removed upon creation/destruction.
The persistence of /etc/hosts entries while a vm is in a halted or
suspended state is undesirable especially when hostmanager.manage_host
is set to true. That would mean your host's /etc/hosts would retain
entries even if you aren't currently using a vm.  The vm would have to
be destroyed for the entry to be removed from the host's /etc/hosts.

Adding hooks for halt, resume and suspend commands and changing the
concept of active and offline states from created or not_created to
running or not running allows a vm's entry to be added when it is put
in a running state and removed when it is not running.

The hostmanager.include_offline can be set to true if one still desires
to have not_created or not running machines' entries included in the
/etc/hosts file.
2013-08-12 12:16:40 -04:00
Shawn Dahlen 063c749fe5 Fix issue #26.
This commits adds a check in the config validation to allow for
UNSET_VALUE for boolean attributes. This is required when finalize is
not executed.
2013-07-19 11:40:01 -04:00
Shawn Dahlen 46affe82c8 Bumb version for hot fix. 2013-06-21 09:38:56 -04:00
Shawn Dahlen 126fb157d7 Merge pull request #19 from b2jrock/manage_host_object_error
Fix typo in config.rb.
2013-06-20 14:03:51 -07:00
Brian Johnson beeae8d0f7 Fix typo in config.rb. 2013-06-20 13:48:29 -07:00
Shawn Dahlen 4ce7cd498e Finish support for managing host /etc/hosts file.
This commit moves logic into action middleware and ensures that
config validation is executed when the hostmanager command is called.
2013-06-20 12:54:20 -04:00
Shawn Dahlen 064d9b8658 Clean up plugin configuration and add comments.
This commit cleaned up the plugin's configuration and added code
comments for the hosts_file module. Additionally, display messages were
re-organized based on the single action.

The command still requires code to validate the configuration before
execution.

This closes pull request #18. Thanks to @b2jrock for his contribution.
2013-06-19 12:11:05 -04:00
Shawn Dahlen a39877ac27 Add support for managing host /etc/hosts file.
This commit also include preservation original /etc/hosts file on
guest machines.
2013-06-18 17:26:29 -04:00
Brian Johnson 2a190a299e Cleanup tempfiles when done. 2013-06-17 22:36:21 -07:00
Brian Johnson 782168492c - Ensure that empty regex isn't processed for deletes.
- Set the hook for deletion to run prior to machine deletion so that the id is retrieveable.
2013-06-17 12:59:07 -07:00
Brian Johnson 733e451216 Fix overwrite bug that was inadvertently regressed in the merge. 2013-06-13 16:20:00 -07:00
Brian Johnson e217beeabe Merge branch 'master' into new-hosts-os-hosts-file
Conflicts:
	lib/vagrant-hostmanager/config.rb
	lib/vagrant-hostmanager/hosts_file.rb
	locales/en.yml
2013-06-13 13:52:09 -07:00
Brian Johnson 1e698e5912 Update to do an update of hosts files while leaving existing host structure in place, rather than generating a local hosts entry automatically. 2013-06-13 13:48:38 -07:00
Brian Johnson 67644a6de0 Add management of hostsfile on the host machine. 2013-06-13 13:48:19 -07:00
Artur Roszczyk 7fd5ceeb05 Update README.md
Add description of custom IP resolver
2013-06-09 13:51:25 +02:00
Artur Roszczyk ed76e4b0e3 Allow to define custom IP resolver 2013-06-06 21:56:01 +02:00
Shawn Dahlen a078935cb0 Bump version for release. 2013-05-07 10:26:31 -04:00
Shawn Dahlen ad1febbe27 Merge pull request #14 from vStone/feature/include_offline_boxes
Added option to include offline boxes in the hosts file.
2013-05-07 07:14:56 -07:00
Jan Vansteenkiste 00b8e75a7d Support include_offline boxes.
If include_offline is enabled, we loop over all available boxes picking
those with the correct provider.

If a box has no private ip set or is offline, it is skipped (a warning is shown).
The lambda that gets the ip will return nil for the boxes.
2013-05-07 16:06:04 +02:00
Jan Vansteenkiste 0b3e60cb5d Added new include_offline configuration item 2013-05-07 16:06:04 +02:00
Jan Vansteenkiste 6e4a2ae967 Abstract the get_machines part. Prepare for include offline. 2013-05-07 16:06:03 +02:00
Shawn Dahlen 1715eca3dc Merge pull request #13 from vStone/feature/i18n_more_things
use more I18n and do not repeat ourselves while doing config checks
2013-05-07 06:46:34 -07:00
Shawn Dahlen 51dfbe41c3 Merge pull request #12 from vStone/feature/respond_to_-v
Respond to "vagrant hostmanager -v" and display our version
2013-05-07 06:45:28 -07:00
Jan Vansteenkiste b67661407f Respond to "vagrant hostmanager -v" and display our version 2013-05-02 21:44:02 +02:00
Jan Vansteenkiste 3a96f5e170 use more I18n and do not repeat ourselves while doing config checks 2013-05-02 21:35:48 +02:00