Permalink
Browse files

Use attributes directly in exhibitor.property

Fixes #65
  • Loading branch information...
1 parent 1b7c032 commit 3c564111aca489720f2c6f8b4e451f40169b6418 @trane committed Mar 6, 2014
Showing with 16 additions and 17 deletions.
  1. +1 −2 recipes/exhibitor.rb
  2. +15 −15 templates/default/exhibitor.properties.erb
View
@@ -109,8 +109,7 @@
variables(
:snapshot_dir => node[:exhibitor][:snapshot_dir],
:transaction_dir => node[:exhibitor][:transaction_dir],
- :log_index_dir => node[:exhibitor][:log_index_dir],
- :defaultconfig => node[:exhibitor][:defaultconfig] )
+ :log_index_dir => node[:exhibitor][:log_index_dir])
end
service "exhibitor" do
@@ -1,18 +1,18 @@
zookeeper-data-directory=<%= @snapshot_dir %>
-cleanup-period-ms=<%= @defaultconfig[:cleanup_period_ms] %>
-zookeeper-install-directory=<%= @defaultconfig[:zookeeper_install_directory] %>
-check-ms=<%= @defaultconfig[:check_ms] %>
+cleanup-period-ms=<%= node[:exhibitor][:defaultconfig][:cleanup_period_ms] %>
+zookeeper-install-directory=<%= node[:exhibitor][:defaultconfig][:zookeeper_install_directory] %>
+check-ms=<%= node[:exhibitor][:defaultconfig][:check_ms] %>
zookeeper-log-directory=<%= @transaction_dir %>
log-index-directory=<%= @log_index_dir %>
-backup-period-ms=<%= @defaultconfig[:backup_period_ms] %>
-client-port=<%= @defaultconfig[:client_port] %>
-cleanup-max-files=<%= @defaultconfig[:cleanup_max_files] %>
-backup-max-store-ms=<%= @defaultconfig[:backup_max_store_ms] %>
-connect-port=<%= @defaultconfig[:connect_port] %>
-backup-extra=<%= @defaultconfig[:backup_extra] %>
-observer-threshold=<%= @defaultconfig[:observer_threshold] %>
-election-port=<%= @defaultconfig[:election_port] %>
-zoo-cfg-extra=<%= @defaultconfig[:zoo_cfg_extra] %>
-auto-manage-instances-settling-period-ms=<%= @defaultconfig[:auto_manage_instances_settling_period_ms] %>
-auto-manage-instances=<%= @defaultconfig[:auto_manage_instances] %>
-servers-spec=<%= @defaultconfig[:servers_spec] %>
+backup-period-ms=<%= node[:exhibitor][:defaultconfig][:backup_period_ms] %>
+client-port=<%= node[:exhibitor][:defaultconfig][:client_port] %>
+cleanup-max-files=<%= node[:exhibitor][:defaultconfig][:cleanup_max_files] %>
+backup-max-store-ms=<%= node[:exhibitor][:defaultconfig][:backup_max_store_ms] %>
+connect-port=<%= node[:exhibitor][:defaultconfig][:connect_port] %>
+backup-extra=<%= node[:exhibitor][:defaultconfig][:backup_extra] %>
+observer-threshold=<%= node[:exhibitor][:defaultconfig][:observer_threshold] %>
+election-port=<%= node[:exhibitor][:defaultconfig][:election_port] %>
+zoo-cfg-extra=<%= node[:exhibitor][:defaultconfig][:zoo_cfg_extra] %>
+auto-manage-instances-settling-period-ms=<%= node[:exhibitor][:defaultconfig][:auto_manage_instances_settling_period_ms] %>
+auto-manage-instances=<%= node[:exhibitor][:defaultconfig][:auto_manage_instances] %>
+servers-spec=<%= node[:exhibitor][:defaultconfig][:servers_spec] %>

0 comments on commit 3c56411

Please sign in to comment.