Use lazy evaluation for config_dir attribute

Fixes #151 Tested changes with ubuntu 14.04 and 12.04
evertrue · Dec 21, 2015 · 6750ea8 · 6750ea8
1 parent bdd2445
commit 6750ea8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -9,7 +9,7 @@
 default[:zookeeper][:install_dir] = '/opt/zookeeper'
 default[:zookeeper][:use_java_cookbook] = true
 default[:zookeeper][:config_dir]  = "#{node[:zookeeper][:install_dir]}/" \
-                                    "zookeeper-#{node[:zookeeper][:version]}/conf"
+                                    'zookeeper-%{zookeeper_version}/conf'
 default[:zookeeper][:conf_file]   = 'zoo.cfg'
 default[:zookeeper][:java_opts] = "-Xms128M -Xmx512M"
 default[:zookeeper][:log_dir]     = "/var/log/zookeeper"

diff --git a/recipes/config_render.rb b/recipes/config_render.rb
@@ -16,7 +16,8 @@
 
 # set the config path based on default attributes
 # render out our config
-zookeeper_config "#{node[:zookeeper][:config_dir]}/#{node[:zookeeper][:conf_file]}" do
+zookeeper_config "zookeeper config" do
+  path   "#{node[:zookeeper][:config_dir] % { zookeeper_version: node[:zookeeper][:version] }}/#{node[:zookeeper][:conf_file]}"
   config node[:zookeeper][:config]
   user   node[:zookeeper][:user]
   action :render