diff --git a/CHANGELOG.md b/CHANGELOG.md index fa5f30c..77e1250 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG for dse-chef +This file is used to list changes made in each version of the dse-chef cookbook. + +## 0.1.0 +* adding *concurrent_compactors* to configuration attributes `node[:datastax][:cassandra][:concurrent_compactors]` +* adding *datastax* data bag item example + ## 0.0.99 * adding server search to opscenter-agent recipe (node[:datastax][:opscenter][:server_role] attribute) * agent configuration will warn and exit when server cannot be found or too many are found diff --git a/README.md b/README.md index 7e72203..fd9850e 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ Chef version 0.10.10+ and Ohai 0.6.12+ are required. ### Platform * Ubuntu 12.10 +* Ubuntu 14.04 **Notes**: This cookbook has been tested on the listed platforms. It may work on other platforms with or without modification. @@ -26,7 +27,16 @@ Installs Java Data Bags --------- -From the *keys* data bag, there should be an item called Datastax that includes the username and password to download Datastax Enterprise. +From the *keys* data bag, there should be an item called _datastax_ that includes the username and password to download Datastax Enterprise. The format of the data in this data bag should be: + +```json +{ + "id": "datastax", + "user": "myuser", + "password": "mypassword" +} +``` + Roles ----- diff --git a/attributes/cassandra.rb b/attributes/cassandra.rb index 9dbf00e..2b00a4c 100644 --- a/attributes/cassandra.rb +++ b/attributes/cassandra.rb @@ -500,7 +500,7 @@ # # concurrent_compactors defaults to the number of cores. # Uncomment to make compaction mono-threaded, the pre-0.8 default. -#concurrent_compactors: 1 +default[:datastax][:cassandra][:concurrent_compactors] = 1 # Multi-threaded compaction. When enabled, each compaction will use # up to one thread per core, plus one thread per sstable being merged. diff --git a/metadata.rb b/metadata.rb index b4b6498..e11e397 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,9 @@ license 'All rights reserved' description 'Installs/Configures dse-chef' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.0.99' +version '0.1.0' + +supports 'ubuntu', '>= 12.04' depends 'java' depends 'apache2' diff --git a/templates/default/cassandra-1.2.yaml.erb b/templates/default/cassandra-1.2.yaml.erb index 2391023..60a1110 100644 --- a/templates/default/cassandra-1.2.yaml.erb +++ b/templates/default/cassandra-1.2.yaml.erb @@ -499,7 +499,11 @@ in_memory_compaction_limit_in_mb: <%= node[:datastax][:cassandra][:in_memory_com # # concurrent_compactors defaults to the number of cores. # Uncomment to make compaction mono-threaded, the pre-0.8 default. +<% if node[:datastax][:cassandra][:concurrent_compactors].nil? || node[:datastax][:cassandra][:concurrent_compactors] < 1 %> #concurrent_compactors: 1 +<% else %> +concurrent_compactors: <%= node[:datastax][:cassandra][:concurrent_compactors] %> +<% end %> # Multi-threaded compaction. When enabled, each compaction will use # up to one thread per core, plus one thread per sstable being merged. diff --git a/templates/default/cassandra-2.0.yaml.erb b/templates/default/cassandra-2.0.yaml.erb index 269b5bb..4498d1e 100644 --- a/templates/default/cassandra-2.0.yaml.erb +++ b/templates/default/cassandra-2.0.yaml.erb @@ -457,7 +457,11 @@ in_memory_compaction_limit_in_mb: <%= node[:datastax][:cassandra][:in_memory_com # # concurrent_compactors defaults to the number of cores. # Uncomment to make compaction mono-threaded, the pre-0.8 default. +<% if node[:datastax][:cassandra][:concurrent_compactors].nil? || node[:datastax][:cassandra][:concurrent_compactors] < 1 %> #concurrent_compactors: 1 +<% else %> +concurrent_compactors: <%= node[:datastax][:cassandra][:concurrent_compactors] %> +<% end %> # Multi-threaded compaction. When enabled, each compaction will use # up to one thread per core, plus one thread per sstable being merged.