File tree Expand file tree Collapse file tree 2 files changed +3
-11
lines changed Expand file tree Collapse file tree 2 files changed +3
-11
lines changed Original file line number Diff line number Diff line change 2121
2222 $init_defaults = {
2323 ' MAX_OPEN_FILES' => ' 65535' ,
24- }.merge( $elasticsearch::init_defaults )
24+ } + $elasticsearch::init_defaults
2525
2626 if ($elasticsearch::ensure == ' present' ) {
2727 file {
164164 # }
165165
166166 # 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
173169
174170 file { "${elasticsearch::configdir}/elasticsearch.yml" :
175171 ensure => ' file' ,
Original file line number Diff line number Diff line change 1919 {
2020 "name" : " puppetlabs/java_ks" ,
2121 "version_requirement" : " >= 1.5.0 < 6.0.0"
22- },
23- {
24- "name" : " puppetlabs/stdlib" ,
25- "version_requirement" : " >= 4.13.0 < 10.0.0"
2622 }
2723 ],
2824 "operatingsystem_support" : [
You can’t perform that action at this time.
0 commit comments