Commit Graph

55 Commits

Author SHA1 Message Date
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
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
Shawn Dahlen c98ddd338e Bump version for release 2013-05-02 15:12:36 -04:00
Shawn Dahlen 8adc104ab8 Merge pull request #9 from vStone/feature/hostmanager-as-provisioner
Use hostmanager as provisioner
2013-05-02 12:10:42 -07:00
Jan Vansteenkiste cae5f6be7d Add Hostmanager as a provisioner. 2013-05-02 20:15:10 +02:00
Shawn Dahlen 36acc16c62 Merge pull request #7 from vStone/feature/fix_run_after_help
hostmanager should not run if we run it with -h
2013-05-02 07:20:53 -07:00
Jan Vansteenkiste f058b3025f Fix small scoping issue. @logger is not available from the provisioner 2013-05-02 08:02:58 +02:00
Jan Vansteenkiste 61ce04040e hostmanager should not run if we run it with -h 2013-05-01 18:42:55 +02:00
Shawn Dahlen 264856478f Fix config validation.
This commit fixes issue #5. Additionally, it deactivates the auto
update behavior by default. Users must set `enabled` to true to activate
auto updates for the hosts file.
2013-04-27 08:13:26 -04:00
Shawn Dahlen ba0decdaa2 update vagrant dependency to 1.2.1 2013-04-26 10:24:01 -04:00
Shawn Dahlen ac09f7273e Merge pull request #6 from nagas/fix/unnecessary-double-check
remove unnecessary checks
2013-04-21 19:01:53 -07:00
Mirosław Nagaś 78f8acf267 remove unnecessary checks 2013-04-20 00:43:12 +02:00
Shawn Dahlen d1201e58b4 Bump version for release 2013-04-17 10:07:34 -04:00
Shawn Dahlen 8a07234527 Fix documentation 2013-04-17 09:57:53 -04:00
Shawn Dahlen 9c984b6abb Merge pull request #4 from nagas/feature/hosts-aliases
provide aliases for host names and configuration options validation
2013-04-17 06:25:12 -07:00
Shawn Dahlen c94b1f8d52 Merge pull request #2 from nagas/improvement/ignore_private_ip
check explicitly if hostmanager.ignore_private_ip is set to true
2013-04-17 05:35:13 -07:00
Shawn Dahlen dd1c3fa76e Merge pull request #3 from nagas/improvement/add-localhost.localdomain
add localhost.localdomain alias as it is required by some services
2013-04-17 05:32:08 -07:00
Mirosław Nagaś 5f384570ca update README 2013-04-17 12:24:45 +02:00
Mirosław Nagaś e0203cddc8 check explicitly if hostmanager.ignore_private_ip is set to true 2013-04-17 11:44:20 +02:00
Mirosław Nagaś 0d7ecf5f4a add simple host aliases implementation and configuration options validation 2013-04-17 11:34:47 +02:00
Mirosław Nagaś b1d4922ffa add localhost.localdomain alias as it is required by some services 2013-04-17 11:26:37 +02:00
Shawn Dahlen 655612b9f6 Fixed argument parsing for command 2013-04-09 15:46:43 -04:00
Shawn Dahlen 33c391cfe0 Implement check for already active machine.
This commit re-instates the behavior of auto-updating the
/etc/hosts file on each active machine. If machine is already
active, no update will occur.
2013-04-08 13:20:22 -04:00