bump solr version to 4.10.2 and cookbook version to 0.5.2

vkhatri · Nov 5, 2014 · cd375e2 · cd375e2
1 parent efceee1
commit cd375e2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@ solrcloud CHANGELOG
 
 This file is used to list changes made in each version of the solrcloud cookbook.
 
+0.5.2
+-----
+
+- Virender Khatri - `node['solrcloud']['zkconfigsets_home']` default directory location updated to
+                    `/usr/local/solr_zkconfigsets`
+
+- Virender Khatri - Bump Apache Solr version to 4.10.2
+
 0.5.0
 -----
 

diff --git a/README.md b/README.md
@@ -350,7 +350,7 @@ Parameters:
 
  * `default[:solrcloud][:setup_user]` (default: `true`): manage solr user for solr service using `solrcloud::user` cookbook
 
- * `default[:solrcloud][:version]` (default: `4.9.0`): solr package version
+ * `default[:solrcloud][:version]` (default: `4.10.2`): solr package version
 
  * `default[:solrcloud][:zk_run_data_dir]` (default: `node[:solrcloud][:install_dir]/zookeeperdata`): embedded zookeeper data directory
 
@@ -385,7 +385,7 @@ Parameters:
 
  * `default[:solrcloud][:zkconfigsets_cookbook]` (default: `solrcloud`): zookeeper configSet cookbook
 
- * `default[:solrcloud][:zkconfigsets_home]` (default: `node[:solrcloud][:install_dir]/zkconfigs`): configs location for zookeeper configSet upconfig
+ * `default[:solrcloud][:zkconfigsets_home]` (default: `/usr/local/solr_zkconfigsets`): configs location for zookeeper configSet upconfig
 
  * `default[:solrcloud][:zookeeper][:version]` (default: `3.4.6`): zookeeper package setup for zkCli.sh
 

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -5,7 +5,7 @@
 default['solrcloud']['user_home']     = nil
 default['solrcloud']['setup_user']    = true # ideally it must be set to false for Production environment and advised to manage solr user via different cookbook
 
-default['solrcloud']['version']       = '4.10.1'
+default['solrcloud']['version']       = '4.10.2'
 
 default['solrcloud']['install_dir']   = '/usr/local/solr'
 default['solrcloud']['data_dir']      = '/opt/solr'
@@ -166,14 +166,14 @@
 default['solrcloud']['solr_config']['logging']['watcher']['threshold']     = 'INFO'
 
 # Solr Directories
-default['solrcloud']['solr_home']   = File.join(node['solrcloud']['install_dir'], 'solr')
-default['solrcloud']['cores_home']  = File.join(node['solrcloud']['solr_home'], 'cores/')
-default['solrcloud']['shared_lib']  = File.join(node['solrcloud']['install_dir'], 'lib')
+default['solrcloud']['solr_home']   = ::File.join(node['solrcloud']['install_dir'], 'solr')
+default['solrcloud']['cores_home']  = ::File.join(node['solrcloud']['solr_home'], 'cores/')
+default['solrcloud']['shared_lib']  = ::File.join(node['solrcloud']['install_dir'], 'lib')
 
 # Solr default configSets directory
-default['solrcloud']['config_sets'] = File.join(node['solrcloud']['solr_home'], 'configsets')
+default['solrcloud']['config_sets'] = ::File.join(node['solrcloud']['solr_home'], 'configsets')
 
-default['solrcloud']['zk_run_data_dir']  = File.join(node['solrcloud']['install_dir'], 'zookeeperdata')
+default['solrcloud']['zk_run_data_dir']  = ::File.join(node['solrcloud']['install_dir'], 'zookeeperdata')
 
 # Set zkHost for zookeeper configSet management
 default['solrcloud']['solr_config']['solrcloud']['zk_host'] = ["#{node['ipaddress']}:#{node['solrcloud']['zk_run_port']}"] if node['solrcloud']['zk_run']
@@ -189,7 +189,7 @@
 default['solrcloud']['tarball']['url']  = "https://archive.apache.org/dist/lucene/solr/#{node['solrcloud']['version']}/solr-#{node['solrcloud']['version']}.tgz"
 default['solrcloud']['tarball']['md5']  = '316f11ed8e81cf07ebfa6ad9443add09'
 
-default['solrcloud']['key_store']['key_store_file_path']  = File.join(node['solrcloud']['install_dir'], 'etc', node['solrcloud']['key_store']['key_store_file'])
+default['solrcloud']['key_store']['key_store_file_path']  = ::File.join(node['solrcloud']['install_dir'], 'etc', node['solrcloud']['key_store']['key_store_file'])
 
-default['solrcloud']['jmx']['password_file']  = File.join(node['solrcloud']['install_dir'], 'resources', 'jmxremote.password')
-default['solrcloud']['jmx']['access_file']    = File.join(node['solrcloud']['install_dir'], 'resources', 'jmxremote.access')
+default['solrcloud']['jmx']['password_file']  = ::File.join(node['solrcloud']['install_dir'], 'resources', 'jmxremote.password')
+default['solrcloud']['jmx']['access_file']    = ::File.join(node['solrcloud']['install_dir'], 'resources', 'jmxremote.access')
diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license 'Apache 2.0'
 description 'Installs/Configures Apache Solr'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '0.5.0'
+version '0.5.2'
 
 depends 'java'
 depends 'ulimit'