diff --git a/.travis.yml b/.travis.yml index f773c497..a0508127 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,3 +6,4 @@ branches: only: - master script: bundle exec rake unit +dist: precise diff --git a/Gemfile b/Gemfile index f9de5d20..e9940383 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'berkshelf' gem 'chefspec' gem 'foodcritic' gem 'rake' -gem 'rubocop' +gem 'rubocop', '= 0.49.0' gem 'nokogiri', '= 1.6.8.1' diff --git a/templates/default/cassandra-cli.erb b/templates/default/cassandra-cli.erb index 5bc6c01b..44f9df97 100644 --- a/templates/default/cassandra-cli.erb +++ b/templates/default/cassandra-cli.erb @@ -19,7 +19,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -for j in <%= node.cassandra.lib_dir %>/*.jar; do +for j in <%= node['cassandra']['lib_dir'] %>/*.jar; do [ "x$CLASSPATH" = "x" ] && CLASSPATH=$j || CLASSPATH=$CLASSPATH:$j done for j in /usr/share/$NAME/*.jar; do diff --git a/templates/default/cassandra.envvars.erb b/templates/default/cassandra.envvars.erb index 0eccf98c..66c93e57 100644 --- a/templates/default/cassandra.envvars.erb +++ b/templates/default/cassandra.envvars.erb @@ -1,9 +1,9 @@ # environment variables necessary to run nodetool -CASSANDRA_CONF=<%= node.cassandra.conf_dir %> -CLASSPATH=$CASSANDRA_CONF:<%= node.cassandra.bin_dir %> +CASSANDRA_CONF=<%= node['cassandra']['conf_dir'] %> +CLASSPATH=$CASSANDRA_CONF:<%= node['cassandra']['bin_dir'] %> -for jar in <%= node.cassandra.lib_dir %>/*.jar; do +for jar in <%= node['cassandra']['lib_dir'] %>/*.jar; do CLASSPATH="$CLASSPATH:$jar" done