in cassandra-env.sh, when comparing JVM_PATCH_VERSION, currently stri…

…ng cmp is used which shows "101" < "25", hence changing the comparison to -lt cmp Change-Id: If5318b46057cc8aac6ae35f6fa1e32d40d33236d Closes-Bug: #1573841
Juniper · Jun 24, 2016 · 311fb06 · 311fb06
1 parent f782a2a
commit 311fb06
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/contrail/environment/modules/contrail/manifests/database/config_cassandra.pp b/contrail/environment/modules/contrail/manifests/database/config_cassandra.pp
@@ -133,4 +133,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 => '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/\' $cassandra_env_file',
+        provider => shell,
+      }
 }