diff --git a/manifests/config.pp b/manifests/config.pp index f4316ce9..9aeb2cb1 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -21,7 +21,7 @@ $init_defaults = { 'MAX_OPEN_FILES' => '65535', - }.merge($elasticsearch::init_defaults) + } + $elasticsearch::init_defaults if ($elasticsearch::ensure == 'present') { file { @@ -164,12 +164,8 @@ # } # Generate Elasticsearch config - $data = merge( - $elasticsearch::config, - { 'path.data' => $elasticsearch::datadir }, - { 'path.logs' => $elasticsearch::logdir }, - $_tls_config - ) + $data = + $elasticsearch::config + { 'path.data' => $elasticsearch::datadir } + { 'path.logs' => $elasticsearch::logdir } + $_tls_config file { "${elasticsearch::configdir}/elasticsearch.yml": ensure => 'file', diff --git a/metadata.json b/metadata.json index 77847e98..3cebcac3 100644 --- a/metadata.json +++ b/metadata.json @@ -19,10 +19,6 @@ { "name": "puppetlabs/java_ks", "version_requirement": ">= 1.5.0 < 6.0.0" - }, - { - "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.13.0 < 10.0.0" } ], "operatingsystem_support": [