Skip to content

Commit

Permalink
in cassandra-env.sh, when comparing JVM_PATCH_VERSION, currently stri…
Browse files Browse the repository at this point in the history
…ng cmp is

used which shows "101" < "25", hence changing the comparison to -lt cmp

Change-Id: If5318b46057cc8aac6ae35f6fa1e32d40d33236d
Closes-Bug: #1573841
(cherry picked from commit 311fb06)
  • Loading branch information
Raj Reddy committed Jun 29, 2016
1 parent f8390a4 commit 3a919db
Showing 1 changed file with 8 additions and 0 deletions.
Expand Up @@ -19,6 +19,9 @@
# 'commitlog_directory' => "${database_dir}/commitlog",
# },
#}

$jvm_version_chk = 'sed -i -e \'s/if \[ \"\$JVM_VERSION\" \\< \"1.8\" \] && \[ \"\$JVM_PATCH_VERSION\" \\< \"25\" \] ; then/if \[ \"\$JVM_VERSION\" \\< \"1.8\" \] \&\& \[ \"\$JVM_PATCH_VERSION\" -lt \"25\" \] ; then/\' '

package {'cassandra':
ensure => latest,
configfiles => "replace",
Expand Down Expand Up @@ -133,4 +136,9 @@
command => "sed -i -e 's/lib\/jamm-0.2.5.jar/lib\/jamm-0.3.0.jar/' $cassandra_env_file",
provider => shell,
}
exec {
'cassandra-env-update':
command => "${jvm_version_chk}${cassandra_env_file}",
provider => shell,
}
}

0 comments on commit 3a919db

Please sign in to comment.