Merge "in cassandra-env.sh, when comparing JVM_PATCH_VERSION, current…

…ly string cmp is used which shows "101" < "25", hence changing the comparison to -lt cmp" into R3.0
Juniper · Jun 30, 2016 · 34bf1aa · 34bf1aa
2 parents 78a4eb4 + 3a919db
commit 34bf1aa
Showing 1 changed file with 8 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
@@ -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",
@@ -137,4 +140,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,
+      }
 }