Merge pull request #1211 from asusk7m550/master

Use Elasticsearch 7+ as default for configuration

Author: h-haaks

manifests/config.pp

@@ -100,7 +100,15 @@
       }
 
       # Set the correct xpack. settings based on ES version
-      if ($elasticsearch::version != false and versioncmp($elasticsearch::version, '7') >= 0) {
+      if ($elasticsearch::version != false and versioncmp($elasticsearch::version, '7') < 0) {
+        $_tls_config = {
+          'xpack.security.transport.ssl.enabled' => true,
+          'xpack.security.http.ssl.enabled'      => true,
+          'xpack.ssl.keystore.path'              => $_keystore_path,
+          'xpack.ssl.keystore.password'          => $elasticsearch::keystore_password,
+        }
+      }
+      else {
         $_tls_config = {
           'xpack.security.http.ssl.enabled'                => true,
           'xpack.security.http.ssl.keystore.path'          => $_keystore_path,
@@ -110,14 +118,6 @@
           'xpack.security.transport.ssl.keystore.password' => $elasticsearch::keystore_password,
         }
       }
-      else {
-        $_tls_config = {
-          'xpack.security.transport.ssl.enabled' => true,
-          'xpack.security.http.ssl.enabled'      => true,
-          'xpack.ssl.keystore.path'              => $_keystore_path,
-          'xpack.ssl.keystore.password'          => $elasticsearch::keystore_password,
-        }
-      }
 
       # Trust CA Certificate
       java_ks { 'elasticsearch_ca':