File tree 2 files changed +3
-11
lines changed
2 files changed +3
-11
lines changed Original file line number Diff line number Diff line change 21
21
22
22
$init_defaults = {
23
23
' MAX_OPEN_FILES' => ' 65535' ,
24
- }.merge( $elasticsearch::init_defaults )
24
+ } + $elasticsearch::init_defaults
25
25
26
26
if ($elasticsearch::ensure == ' present' ) {
27
27
file {
164
164
# }
165
165
166
166
# Generate Elasticsearch config
167
- $data = merge(
168
- $elasticsearch::config ,
169
- { ' path.data' => $elasticsearch::datadir },
170
- { ' path.logs' => $elasticsearch::logdir },
171
- $_tls_config
172
- )
167
+ $data =
168
+ $elasticsearch::config + { ' path.data' => $elasticsearch::datadir } + { ' path.logs' => $elasticsearch::logdir } + $_tls_config
173
169
174
170
file { "${elasticsearch::configdir}/elasticsearch.yml" :
175
171
ensure => ' file' ,
Original file line number Diff line number Diff line change 19
19
{
20
20
"name" : " puppetlabs/java_ks" ,
21
21
"version_requirement" : " >= 1.5.0 < 6.0.0"
22
- },
23
- {
24
- "name" : " puppetlabs/stdlib" ,
25
- "version_requirement" : " >= 4.13.0 < 10.0.0"
26
22
}
27
23
],
28
24
"operatingsystem_support" : [
You can’t perform that action at this time.
0 commit comments