Comments (1)
I think the following code will work
diff --git a/manifests/config.pp b/manifests/config.pp
index 5f48fb6..1d690fd 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -100,7 +100,15 @@ class elasticsearch::config {
}
# 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 @@ class elasticsearch::config {
'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':
@@ -181,7 +181,7 @@ class elasticsearch::config {
mode => '0440',
}
- if ($elasticsearch::version != false and versioncmp($elasticsearch::version, '7.7.0') >= 0) {
+ if ($elasticsearch::version == false or versioncmp($elasticsearch::version, '7.7.0') >= 0) {
# https://www.elastic.co/guide/en/elasticsearch/reference/master/advanced-configuration.html#set-jvm-options
# https://github.com/elastic/elasticsearch/pull/51882
# >> "Do not modify the root jvm.options file. Use files in jvm.options.d/ instead."
from puppet-elasticsearch.
Related Issues (20)
- elasticsearch_keystore can't modify frozen String
- elasticsearch_keystore resource fails due to legacy instance code HOT 3
- Node facts not generated when Elasticsearch in cluster mode
- Could not evaluate: undefined method `join' for :name:Symbol HOT 2
- elasticsearch_plugin/ruby.rb wrong path to call plugin binary HOT 2
- ssl=true and version is not defined, gives an error HOT 1
- Setting an Elastic Version should be optional HOT 1
- New release, please HOT 1
- OpenSearch support ? HOT 1
- Elasticsearch API responded with: no handler found for uri [/_xpack/license?acknowledge=true] and method [PUT]
- File jvm.options in root is unmanaged/may be missing
- why was log4j2.properties.erb configuration commented ? HOT 1
- warnings when used with stlib 9. HOT 1
- fix lib directory permissions without changing the mode of files in the directory
- puppet-elastic_stack version HOT 1
- mediawiki needs 6.8.23 and I needed to change this
- Issues on the elasticsearch_component_template.rb and elasticsearch_index_template.rb HOT 2
- Problem with puppet CA and elasticsearch.keystore
- `bin/plugin` is used insead of `bin/elasticsearch-plugin` on the first run
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from puppet-elasticsearch.