Skip to content

Commit

Permalink
Chef property access is not supproted with chef 13.2.20
Browse files Browse the repository at this point in the history
  • Loading branch information
Yaniv Marom Nachumi committed Jul 30, 2017
1 parent 6afe662 commit 76830c1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -6,3 +6,4 @@ branches:
only:
- master
script: bundle exec rake unit
dist: precise
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion templates/default/cassandra-cli.erb
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions 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

Expand Down

0 comments on commit 76830c1

Please sign in to comment.