From 8cd033a69672196c78cedf2ddf0a3f733ad88d5e Mon Sep 17 00:00:00 2001 From: Martin Zobel-Helas Date: Sat, 30 May 2015 18:19:46 +0000 Subject: [PATCH] Revert "Revert "upgrade to elasticsearch/elasticsearch 0.9.6"" This reverts commit b246ebbfa566fda9b4b46616688a45ea17053588. --- 3rdparty/Puppetfile | 2 +- 3rdparty/modules/elasticsearch/CHANGELOG.md | 23 ++++++ 3rdparty/modules/elasticsearch/Gemfile.lock | 60 +++++++------- 3rdparty/modules/elasticsearch/Modulefile | 2 +- 3rdparty/modules/elasticsearch/README.md | 38 ++++++++- 3rdparty/modules/elasticsearch/checksums.json | 78 ++++++------------- .../log/2015-03-13_19_24_02/sut.log | 2 - .../log/2015-03-14_18_41_25/sut.log | 2 - .../log/2015-03-16_02_10_40/sut.log | 2 - .../log/2015-03-16_23_30_55/sut.log | 2 - .../centos-6-x64/2015-04-01_10_00_58/sut.log | 1 - .../centos-6-x64/2015-04-01_10_46_26/sut.log | 1 - .../centos-6-x64/2015-04-01_11_20_04/sut.log | 2 - .../centos-6-x64/2015-04-01_11_27_48/sut.log | 2 - .../centos-6-x64/2015-04-01_11_35_31/sut.log | 2 - .../centos-6-x64/2015-04-01_12_59_57/sut.log | 2 - .../centos-6-x64/2015-04-01_13_09_48/sut.log | 1 - .../centos-6-x64/2015-04-01_13_41_36/sut.log | 1 - .../centos-6-x64/2015-04-01_15_16_35/sut.log | 1 - .../centos-6-x64/2015-04-02_13_13_01/sut.log | 1 - .../centos-6-x64/2015-04-02_13_17_34/sut.log | 1 - .../centos-6-x64/2015-04-02_13_35_46/sut.log | 1 - .../centos-6-x64/2015-04-02_13_46_30/sut.log | 1 - .../centos-7-x64/2015-04-02_10_01_25/sut.log | 1 - .../centos-7-x64/2015-04-02_10_11_32/sut.log | 1 - .../centos-7-x64/2015-04-02_10_23_54/sut.log | 0 .../centos-7-x64/2015-04-02_10_43_22/sut.log | 0 .../centos-7-x64/2015-04-02_10_52_46/sut.log | 1 - .../centos-7-x64/2015-04-02_10_59_12/sut.log | 1 - .../centos-7-x64/2015-04-07_11_27_50/sut.log | 2 - .../centos-7-x64/2015-04-07_21_10_14/sut.log | 1 - .../centos-7-x64/2015-04-07_21_30_33/sut.log | 1 - .../centos-7-x64/2015-04-08_12_40_12/sut.log | 2 - .../centos-7-x64/2015-04-14_09_47_18/sut.log | 1 - .../centos-7-x64/2015-04-14_09_47_40/sut.log | 2 - .../centos-7-x64/2015-04-14_11_41_18/sut.log | 2 - .../centos-7-x64/2015-04-14_13_15_13/sut.log | 2 - .../centos-7-x64/2015-04-15_15_08_00/sut.log | 2 - .../centos-7-x64/2015-04-15_15_14_45/sut.log | 1 - .../centos-7-x64/2015-04-15_15_23_17/sut.log | 1 - .../2015-05-26_15_29_16}/sut.log | 0 .../sut.log | 0 .../sut.log | 0 .../sut.log | 0 .../centos-7-x64/2015-05-26_15_55_33/sut.log | 2 + .../debian-6-x64/2015-05-27_10_02_38/sut.log | 2 + .../debian-7-x64/2015-04-02_13_54_36/sut.log | 1 - .../debian-7-x64/2015-04-02_15_23_38/sut.log | 1 - .../debian-7-x64/2015-05-26_17_15_46/sut.log | 2 + .../debian-8-x64/2015-05-26_16_05_54/sut.log | 2 + .../debian-8-x64/2015-05-26_16_16_38/sut.log | 1 + .../debian-8-x64/2015-05-26_16_34_43/sut.log | 2 + .../debian-8-x64/2015-05-26_16_57_52/sut.log | 2 + .../2015-04-14_13_30_41/sut.log | 2 - .../2015-04-15_14_55_52/sut.log | 2 - .../2015-04-15_15_45_01/sut.log | 1 - .../modules/elasticsearch/manifests/config.pp | 2 +- .../modules/elasticsearch/manifests/init.pp | 14 +++- .../modules/elasticsearch/manifests/params.pp | 50 ++++++++---- .../modules/elasticsearch/manifests/plugin.pp | 12 +++ .../modules/elasticsearch/manifests/repo.pp | 28 +++++++ .../manifests/service/systemd.pp | 34 +++++--- 3rdparty/modules/elasticsearch/metadata.json | 7 +- .../etc/init.d/elasticsearch.systemd.erb | 14 ++-- 64 files changed, 253 insertions(+), 177 deletions(-) delete mode 100644 3rdparty/modules/elasticsearch/log/2015-03-13_19_24_02/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/2015-03-14_18_41_25/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/2015-03-16_02_10_40/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/2015-03-16_23_30_55/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_10_00_58/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_10_46_26/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_11_20_04/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_11_27_48/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_11_35_31/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_12_59_57/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_13_09_48/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_13_41_36/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_15_16_35/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_13_01/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_17_34/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_35_46/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_46_30/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_01_25/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_11_32/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_23_54/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_43_22/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_52_46/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_59_12/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-07_11_27_50/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-07_21_10_14/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-07_21_30_33/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-08_12_40_12/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_09_47_18/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_09_47_40/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_11_41_18/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_13_15_13/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_08_00/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_14_45/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_23_17/sut.log rename 3rdparty/modules/elasticsearch/log/{centos-6-x64/2015-04-02_13_26_48 => centos-7-x64/2015-05-26_15_29_16}/sut.log (100%) rename 3rdparty/modules/elasticsearch/log/centos-7-x64/{2015-04-02_09_58_58 => 2015-05-26_15_30_01}/sut.log (100%) rename 3rdparty/modules/elasticsearch/log/centos-7-x64/{2015-04-02_10_12_51 => 2015-05-26_15_31_34}/sut.log (100%) rename 3rdparty/modules/elasticsearch/log/centos-7-x64/{2015-04-02_10_15_37 => 2015-05-26_15_39_48}/sut.log (100%) create mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-05-26_15_55_33/sut.log create mode 100644 3rdparty/modules/elasticsearch/log/debian-6-x64/2015-05-27_10_02_38/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/debian-7-x64/2015-04-02_13_54_36/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/debian-7-x64/2015-04-02_15_23_38/sut.log create mode 100644 3rdparty/modules/elasticsearch/log/debian-7-x64/2015-05-26_17_15_46/sut.log create mode 100644 3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_05_54/sut.log create mode 100644 3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_16_38/sut.log create mode 100644 3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_34_43/sut.log create mode 100644 3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_57_52/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-14_13_30_41/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-15_14_55_52/sut.log delete mode 100644 3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-15_15_45_01/sut.log diff --git a/3rdparty/Puppetfile b/3rdparty/Puppetfile index ba64f0725..4272d86a3 100644 --- a/3rdparty/Puppetfile +++ b/3rdparty/Puppetfile @@ -6,4 +6,4 @@ forge "http://forge.puppetlabs.com" #mod 'puppetlabs/xinetd', '1.5.0' #mod 'puppetlabs/stunnel', '0.1.0' -mod 'elasticsearch/elasticsearch', '0.9.5' +mod 'elasticsearch/elasticsearch', '0.9.6' diff --git a/3rdparty/modules/elasticsearch/CHANGELOG.md b/3rdparty/modules/elasticsearch/CHANGELOG.md index 6b491bf02..62c017893 100644 --- a/3rdparty/modules/elasticsearch/CHANGELOG.md +++ b/3rdparty/modules/elasticsearch/CHANGELOG.md @@ -1,3 +1,26 @@ +##0.9.6 ( May 28, 2015 ) + +###Summary +Bugfix release 0.9.6 + +####Features +* Implemented package version pinning to avoid accidental upgrading +* Added support for Debian 8 +* Added support for upgrading plugins +* Managing LimitNOFILE and LimitMEMLOCK settings in systemd + +####Bugfixes + +####Changes +* Dropped official support for PE 3.1.x and 3.2.x + +####Testing changes +* Several testing changes implemented to increase coverage + +####Known bugs +* Possible package conflicts when using ruby/python defines with main package name + + ##0.9.5( Apr 16, 2015 ) ###Summary diff --git a/3rdparty/modules/elasticsearch/Gemfile.lock b/3rdparty/modules/elasticsearch/Gemfile.lock index 5965167d9..6c43ed36d 100644 --- a/3rdparty/modules/elasticsearch/Gemfile.lock +++ b/3rdparty/modules/elasticsearch/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/nibalizer/metadata-json-lint.git - revision: c2225fed4b88aef1945e8da3f8580709939371cd + revision: 699ad34f0e1210a495036ce5aac2a97f1f0ba803 branch: master specs: metadata-json-lint (0.0.6) @@ -20,10 +20,10 @@ GIT GIT remote: https://github.com/puppetlabs/beaker.git - revision: d854fcaeb013170ed4bc8189e00cbc6cea9848b7 + revision: 62845ce99989952d30dd122c75404d43aa6c90cc branch: master specs: - beaker (2.9.0) + beaker (2.12.0) aws-sdk (~> 1.57) docker-api fission (~> 0.4) @@ -41,16 +41,16 @@ GIT GIT remote: https://github.com/rodjek/rspec-puppet.git - revision: a9a837669cf6955279f02d1d9b524dc140b9d3e8 + revision: 776eff5e4daec60970ec8003efae350dcd41d017 branch: master specs: - rspec-puppet (2.0.1) + rspec-puppet (2.1.0) rspec GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.1) + CFPropertyList (2.2.8) activesupport (4.2.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) @@ -85,23 +85,25 @@ GEM descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) diff-lcs (1.2.5) - docker-api (1.21.0) + docker-api (1.21.4) excon (>= 0.38.0) json equalizer (0.0.11) - excon (0.45.1) + excon (0.45.3) extlib (0.9.16) - facter (1.7.6) + facter (2.4.4) + CFPropertyList (~> 2.2.6) faraday (0.9.1) multipart-post (>= 1.2, < 3) fission (0.5.0) CFPropertyList (~> 2.2) - fog (1.29.0) + fog (1.30.0) fog-atmos fog-aws (~> 0.0) fog-brightbox (~> 0.4) fog-core (~> 1.27, >= 1.27.4) fog-ecloud + fog-google (>= 0.0.2) fog-json fog-local fog-powerdns (>= 0.1.1) @@ -121,7 +123,7 @@ GEM fog-atmos (0.1.0) fog-core fog-xml - fog-aws (0.1.2) + fog-aws (0.3.0) fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) @@ -140,6 +142,10 @@ GEM fog-ecloud (0.1.1) fog-core fog-xml + fog-google (0.0.5) + fog-core + fog-json + fog-xml fog-json (1.0.1) fog-core (~> 1.0) multi_json (~> 1.0) @@ -167,7 +173,7 @@ GEM fog-serverlove (0.1.2) fog-core fog-json - fog-softlayer (0.4.5) + fog-softlayer (0.4.6) fog-core fog-json fog-storm_on_demand (0.1.1) @@ -197,11 +203,11 @@ GEM multi_json (~> 1.10) retriable (~> 1.4) signet (~> 0.6) - googleauth (0.4.0) + googleauth (0.4.1) faraday (~> 0.9) jwt (~> 1.4) - logging (~> 1.8) - memoist (~> 0.11) + logging (~> 2.0) + memoist (~> 0.12) multi_json (= 1.11) signet (~> 0.6) hiera (1.3.4) @@ -214,19 +220,19 @@ GEM ipaddress (0.8.0) json (1.8.2) json_pure (1.8.2) - jwt (1.4.1) + jwt (1.5.0) launchy (2.4.3) addressable (~> 2.3) little-plugger (1.1.3) - logging (1.8.2) - little-plugger (>= 1.1.3) - multi_json (>= 1.8.4) + logging (2.0.0) + little-plugger (~> 1.1) + multi_json (~> 1.10) memoist (0.12.0) metaclass (0.0.4) method_source (0.8.2) - mime-types (2.4.3) + mime-types (2.6.1) mini_portile (0.6.2) - minitest (5.6.0) + minitest (5.6.1) mocha (1.1.0) metaclass (~> 0.0.1) multi_json (1.11.0) @@ -268,7 +274,7 @@ GEM puppet-lint (~> 1.0) puppet-syntax (2.0.0) rake - puppetlabs_spec_helper (0.10.2) + puppetlabs_spec_helper (0.10.3) mocha puppet-lint puppet-syntax @@ -297,18 +303,18 @@ GEM rspec-mocks (3.2.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.2.0) - rspec-puppet-facts (0.6.0) + rspec-puppet-facts (0.8.0) facter json rspec-support (3.2.2) rsync (1.0.9) rubysl-securerandom (2.0.0) safe_yaml (1.0.4) - serverspec (2.14.1) + serverspec (2.17.0) multi_json rspec (~> 3.0) rspec-its - specinfra (~> 2.25) + specinfra (~> 2.32) signet (0.6.0) addressable (~> 2.3) extlib (~> 0.9) @@ -318,7 +324,7 @@ GEM slop (3.6.0) spdx-licenses (1.0.0) json - specinfra (2.28.2) + specinfra (2.34.4) net-scp net-ssh thread_safe (0.3.5) @@ -327,7 +333,7 @@ GEM thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.6) + unf_ext (0.0.7.1) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) diff --git a/3rdparty/modules/elasticsearch/Modulefile b/3rdparty/modules/elasticsearch/Modulefile index 87dd04af6..f926edd9c 100644 --- a/3rdparty/modules/elasticsearch/Modulefile +++ b/3rdparty/modules/elasticsearch/Modulefile @@ -1,5 +1,5 @@ name 'elasticsearch-elasticsearch' -version '0.9.5' +version '0.9.6' source 'https://github.com/elastic/puppet-elasticsearch' author 'elasticsearch' license 'Apache License, Version 2.0' diff --git a/3rdparty/modules/elasticsearch/README.md b/3rdparty/modules/elasticsearch/README.md index d14c45b1d..9d9ebf436 100644 --- a/3rdparty/modules/elasticsearch/README.md +++ b/3rdparty/modules/elasticsearch/README.md @@ -46,7 +46,7 @@ This module has been tested against ES 1.0 and up. #### Repository management When using the repository management you will need the following dependency modules: -* Debian/Ubuntu: [Puppetlabs/apt](http://forge.puppetlabs.com/puppetlabs/apt) +* Debian/Ubuntu: [Puppetlabs/apt](http://forge.puppetlabs.com/puppetlabs/apt) Version 1.8.x or lower. * OpenSuSE: [Darin/zypprepo](https://forge.puppetlabs.com/darin/zypprepo) ##Usage @@ -146,6 +146,24 @@ elasticsearch::plugin { 'lmenezes/elasticsearch-kopf', * `groupId/artifactId/version` for community plugins (download from maven central or oss sonatype) * `username/repository` for site plugins (download from github master) +####Upgrading plugins +When you specify a certain plugin version, you can upgrade that plugin by specifying the new version. + +```puppet +elasticsearch::plugin { 'elasticsearch/elasticsearch-cloud-aws/2.1.1': + module_dir => 'cloud-aws', +} +``` + +And to upgrade, you would simply change it to + +```puppet +elasticsearch::plugin { 'elasticsearch/elasticsearch-cloud-aws/2.4.1': + module_dir => 'cloud-aws', +} +``` + +Please note that this does not work when you specify 'latest' as a version number. ###Scripts @@ -326,6 +344,20 @@ Note: `init_defaults` hash can be passed to the main class and to the instance. ##Advanced features +###Package version pinning + +The module supports pinning the package version to avoid accidental upgrades that are not done by Puppet. +To enable this feature: + +```puppet +class { 'elasticsearch': + package_pin => true, + version => '1.5.2', +} +``` + +In this example we pin the package version to 1.5.2. + ###Data directories @@ -477,8 +509,8 @@ This module has been built on and tested against Puppet 3.2 and higher. The module has been tested on: -* Debian 6/7 -* CentOS 6 +* Debian 6/7/8 +* CentOS 6/7 * Ubuntu 12.04, 14.04 * OpenSuSE 13.x diff --git a/3rdparty/modules/elasticsearch/checksums.json b/3rdparty/modules/elasticsearch/checksums.json index de63f3a13..beaa205ee 100644 --- a/3rdparty/modules/elasticsearch/checksums.json +++ b/3rdparty/modules/elasticsearch/checksums.json @@ -1,79 +1,47 @@ { - "CHANGELOG.md": "b222ad963d1cf385a91269aefab25e3a", + "CHANGELOG.md": "ee0f425605e6fa76137475f2cbb282af", "CONTRIBUTING.md": "c2985e231626a62f65cb661eaa346794", "CONTRIBUTORS": "14df2fd27cf7b6ca9833527f2ba93442", "Gemfile": "2a7c1a11ce3e71d8e644c4966583908f", - "Gemfile.lock": "c7f79ae0acd1d0a5fdc4237af788f5b5", + "Gemfile.lock": "7a8153480e0a0faf1a2b1999e0ed2e2f", "LICENSE": "0e0bfc0e5636afdb297a2aa49d8d933d", - "Modulefile": "185af8836eba1d107a4efc320b9b99af", - "README.md": "910dd00a5cd96ca706f38270ebdb3d2e", + "Modulefile": "f8742783868dbd4f3a38b0ea1751f313", + "README.md": "34e8d1e27b799bad0bb241cdb0325f46", "lib/facter/es_facts.rb": "b4b33e1047d659e45cb2590402f4b376", "lib/puppet/parser/functions/array_suffix.rb": "f4d8cfd448698eb9594f49bb2ed3c263", "lib/puppet/provider/es_instance_conn_validator/tcp_port.rb": "1f20143aa8023524ad568cabc0fc36c8", "lib/puppet/type/es_instance_conn_validator.rb": "60016925ceb392dad8e4d1c7f4bcbea7", "lib/puppet/util/es_instance_validator.rb": "ded80d7d5ae1467f1060a57de7210cad", - "log/2015-03-13_19_24_02/sut.log": "2d4dae0768ba158fbf6f67f9758a88eb", - "log/2015-03-14_18_41_25/sut.log": "c3101099c35c9804c9f47a304a49c82b", - "log/2015-03-16_02_10_40/sut.log": "51407bfcddeb9689ab330c8e8120806b", - "log/2015-03-16_23_30_55/sut.log": "1f0faa9e603fcf3af4b51045e9215c64", - "log/centos-6-x64/2015-04-01_10_00_58/sut.log": "7178cfef99b07ad06de41724fa546bfd", - "log/centos-6-x64/2015-04-01_10_46_26/sut.log": "0378009ae03f995576e749d4ad185973", - "log/centos-6-x64/2015-04-01_11_20_04/sut.log": "1aa97919a8802e10600e204169766ead", - "log/centos-6-x64/2015-04-01_11_27_48/sut.log": "9f0f77ce5e27ee92ab0df845f2a88b5e", - "log/centos-6-x64/2015-04-01_11_35_31/sut.log": "c1e36c2bba3ee22d9abd97625869d4ee", - "log/centos-6-x64/2015-04-01_12_59_57/sut.log": "45b833a47033621d4e428e6d72595f06", - "log/centos-6-x64/2015-04-01_13_09_48/sut.log": "8605000f87fc4c75ac10a1fd949db943", - "log/centos-6-x64/2015-04-01_13_41_36/sut.log": "4fe04bb9ecee5a1c3342faa76eac115f", - "log/centos-6-x64/2015-04-01_15_16_35/sut.log": "f1d994052b796a0a6d19dddd68030c7a", - "log/centos-6-x64/2015-04-02_13_13_01/sut.log": "84e67a9d68180d96ad642f369b85af24", - "log/centos-6-x64/2015-04-02_13_17_34/sut.log": "d92c27493287e89e07b3c0282ca9a936", - "log/centos-6-x64/2015-04-02_13_26_48/sut.log": "d41d8cd98f00b204e9800998ecf8427e", - "log/centos-6-x64/2015-04-02_13_35_46/sut.log": "6af88ca22ceb3297373ff20e180dde19", - "log/centos-6-x64/2015-04-02_13_46_30/sut.log": "426ac949c1e62a590e69e85d5c5b3d8f", - "log/centos-7-x64/2015-04-02_09_58_58/sut.log": "d41d8cd98f00b204e9800998ecf8427e", - "log/centos-7-x64/2015-04-02_10_01_25/sut.log": "9137df4d230e68252b0f0034911f585e", - "log/centos-7-x64/2015-04-02_10_11_32/sut.log": "3a01955c89e470097084c7cd199cd585", - "log/centos-7-x64/2015-04-02_10_12_51/sut.log": "d41d8cd98f00b204e9800998ecf8427e", - "log/centos-7-x64/2015-04-02_10_15_37/sut.log": "d41d8cd98f00b204e9800998ecf8427e", - "log/centos-7-x64/2015-04-02_10_23_54/sut.log": "d41d8cd98f00b204e9800998ecf8427e", - "log/centos-7-x64/2015-04-02_10_43_22/sut.log": "d41d8cd98f00b204e9800998ecf8427e", - "log/centos-7-x64/2015-04-02_10_52_46/sut.log": "58d0e1d5a2a17c63d293b6ee0da923b9", - "log/centos-7-x64/2015-04-02_10_59_12/sut.log": "aaf060a6f29c127da5f20ac56e5d6caa", - "log/centos-7-x64/2015-04-07_11_27_50/sut.log": "a6a881e8ec06d93e7c1d1888435e8265", - "log/centos-7-x64/2015-04-07_21_10_14/sut.log": "ad322e2ba0802035e05511a56cb8467c", - "log/centos-7-x64/2015-04-07_21_30_33/sut.log": "c6cf6b033c0c4d1ea891dc7c59b8f7e2", - "log/centos-7-x64/2015-04-08_12_40_12/sut.log": "6d306dd1d99c149917279b20970e2f45", - "log/centos-7-x64/2015-04-14_09_47_18/sut.log": "af8ac0521a84dccdc4a2279fb638a7c6", - "log/centos-7-x64/2015-04-14_09_47_40/sut.log": "c10f15cab4db9e88b3b43b6f4dbfa271", - "log/centos-7-x64/2015-04-14_11_41_18/sut.log": "dd8ce807b46e24d71f5a5cb78dd07c81", - "log/centos-7-x64/2015-04-14_13_15_13/sut.log": "c84739c6e97c41e570d2a1225e0d6d9e", - "log/centos-7-x64/2015-04-15_15_08_00/sut.log": "4ecf257fe2a8cd45d6031d0561d43b7e", - "log/centos-7-x64/2015-04-15_15_14_45/sut.log": "d2ec3be59c64651015ad9e67f8aa666a", - "log/centos-7-x64/2015-04-15_15_23_17/sut.log": "0ffb87c691eb9ffe961aa3f1af0b6e1f", - "log/debian-7-x64/2015-04-02_13_54_36/sut.log": "4f99087d407ec0c718dff805fb4a4680", - "log/debian-7-x64/2015-04-02_15_23_38/sut.log": "e949997215719242842ac4d692e7c763", - "log/ubuntu-server-1404-x64/2015-04-14_13_30_41/sut.log": "88a27bff98e74f9ef424e29791105b61", - "log/ubuntu-server-1404-x64/2015-04-15_14_55_52/sut.log": "8d7891d70ff9739bfc1fe54d05bed39b", - "log/ubuntu-server-1404-x64/2015-04-15_15_45_01/sut.log": "e150905063b1c0adb7c62a0d8571d668", - "manifests/config.pp": "db109e9924e451663e735ebffb8653e2", - "manifests/init.pp": "5d2d79dae581410d429345a7b3bc8b00", + "log/centos-7-x64/2015-05-26_15_29_16/sut.log": "d41d8cd98f00b204e9800998ecf8427e", + "log/centos-7-x64/2015-05-26_15_30_01/sut.log": "d41d8cd98f00b204e9800998ecf8427e", + "log/centos-7-x64/2015-05-26_15_31_34/sut.log": "d41d8cd98f00b204e9800998ecf8427e", + "log/centos-7-x64/2015-05-26_15_39_48/sut.log": "d41d8cd98f00b204e9800998ecf8427e", + "log/centos-7-x64/2015-05-26_15_55_33/sut.log": "cb221a9ae145385bfbc1be76158f7144", + "log/debian-6-x64/2015-05-27_10_02_38/sut.log": "0c998a71084abb3268d728b540f57f02", + "log/debian-7-x64/2015-05-26_17_15_46/sut.log": "d0db30a58fc61c60ed6f106b5a8b971b", + "log/debian-8-x64/2015-05-26_16_05_54/sut.log": "16e5994e8770423f08605a148b355f15", + "log/debian-8-x64/2015-05-26_16_16_38/sut.log": "90168b2394ad0605dc1e53fdd6931985", + "log/debian-8-x64/2015-05-26_16_34_43/sut.log": "8c5d4ec888dd5e08298659a8feb431c0", + "log/debian-8-x64/2015-05-26_16_57_52/sut.log": "2cdd2aa1cead04a153d66201e0f299fd", + "manifests/config.pp": "2e40936dec73cf82c62208d2fb46a7d0", + "manifests/init.pp": "6aeaae1ffaf5614651496b34550f9a67", "manifests/instance.pp": "ad2f1684674d4004c42f85c45a42d966", "manifests/package.pp": "604dc7b513979918c3734d3326c2769e", - "manifests/params.pp": "2d1315c5466f27ec59b6296996a68e44", - "manifests/plugin.pp": "e45b7ae5fb70ad25da7878a1c8bbb980", + "manifests/params.pp": "e6cc67b4f2327173e3a3d3c637e1f7e6", + "manifests/plugin.pp": "53f34355b810357b952ea08f02728397", "manifests/python.pp": "109f076fea175ffef78da479952dc1a0", - "manifests/repo.pp": "564034ff40e9703e9aa03d3d32c94e8e", + "manifests/repo.pp": "fda5acaa6a2d0a71ff2106b439a4f474", "manifests/ruby.pp": "dd72a2538e23bba1c47618c9b3e6d66f", "manifests/script.pp": "8eaad1494fb7de63c65720400bad7442", "manifests/service/init.pp": "dc6817e1414e59f1fe23470c38a03c5d", - "manifests/service/systemd.pp": "1f69c7e366958dfbdd2034f38c86ee25", + "manifests/service/systemd.pp": "4c98c2ea7d6273fa9a3b35075a9782e0", "manifests/service.pp": "b34e3bb5a3984de44c9ad2566734576e", "manifests/template.pp": "35efdc655772908976df3c69338188fd", - "metadata.json": "1c3a14177ead8218923ef00c822a4ccf", + "metadata.json": "83c6c1106500363afbfd39b7339636e1", "templates/etc/elasticsearch/elasticsearch.yml.erb": "08529839471ef1fac3a9f4a169ec5da8", "templates/etc/elasticsearch/logging.yml.erb": "99062dbf00c6b96d9bec7382dadafb9d", "templates/etc/init.d/elasticsearch.Debian.erb": "e7a586b5fd921ec6819936f44694f4c2", "templates/etc/init.d/elasticsearch.RedHat.erb": "4dde4b836654ea8332d65d852568d2f5", - "templates/etc/init.d/elasticsearch.systemd.erb": "61d511192a7b6a915f590cba546fd889", + "templates/etc/init.d/elasticsearch.systemd.erb": "5217c42fa54752510c6f38e40aa855e4", "templates/etc/sysconfig/defaults.erb": "57b40f8213c0c05d5dcf185bf00a25b7" } \ No newline at end of file diff --git a/3rdparty/modules/elasticsearch/log/2015-03-13_19_24_02/sut.log b/3rdparty/modules/elasticsearch/log/2015-03-13_19_24_02/sut.log deleted file mode 100644 index 5a22630fe..000000000 --- a/3rdparty/modules/elasticsearch/log/2015-03-13_19_24_02/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-03-13 19:25:37 [+] docker el-6-x86_64 centos-6-x64 -2015-03-13 20:02:34 [-] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/2015-03-14_18_41_25/sut.log b/3rdparty/modules/elasticsearch/log/2015-03-14_18_41_25/sut.log deleted file mode 100644 index 1ab900fbc..000000000 --- a/3rdparty/modules/elasticsearch/log/2015-03-14_18_41_25/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-03-14 18:46:32 [+] docker ubuntu-14.04-amd64 ubuntu-14-04 -2015-03-14 19:35:05 [-] docker ubuntu-14.04-amd64 ubuntu-14-04 diff --git a/3rdparty/modules/elasticsearch/log/2015-03-16_02_10_40/sut.log b/3rdparty/modules/elasticsearch/log/2015-03-16_02_10_40/sut.log deleted file mode 100644 index 2ee9d536a..000000000 --- a/3rdparty/modules/elasticsearch/log/2015-03-16_02_10_40/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-03-16 02:10:42 [+] docker el-6-x86_64 centos-6-x64 -2015-03-16 02:47:36 [-] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/2015-03-16_23_30_55/sut.log b/3rdparty/modules/elasticsearch/log/2015-03-16_23_30_55/sut.log deleted file mode 100644 index 95631af6f..000000000 --- a/3rdparty/modules/elasticsearch/log/2015-03-16_23_30_55/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-03-16 23:30:56 [+] docker el-6-x86_64 centos-6-x64 -2015-03-17 00:08:30 [-] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_10_00_58/sut.log b/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_10_00_58/sut.log deleted file mode 100644 index 5f98b9a56..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_10_00_58/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-01 10:01:12 [+] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_10_46_26/sut.log b/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_10_46_26/sut.log deleted file mode 100644 index 5fcb381f7..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_10_46_26/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-01 10:46:27 [+] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_11_20_04/sut.log b/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_11_20_04/sut.log deleted file mode 100644 index d7a5d8ec2..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_11_20_04/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-04-01 11:20:05 [+] docker el-6-x86_64 centos-6-x64 -2015-04-01 11:22:57 [-] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_11_27_48/sut.log b/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_11_27_48/sut.log deleted file mode 100644 index ed1a8dfd1..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_11_27_48/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-04-01 11:27:50 [+] docker el-6-x86_64 centos-6-x64 -2015-04-01 11:30:45 [-] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_11_35_31/sut.log b/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_11_35_31/sut.log deleted file mode 100644 index ac83d3a21..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_11_35_31/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-04-01 11:35:33 [+] docker el-6-x86_64 centos-6-x64 -2015-04-01 11:37:58 [-] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_12_59_57/sut.log b/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_12_59_57/sut.log deleted file mode 100644 index a656a2ceb..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_12_59_57/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-04-01 12:59:58 [+] docker el-6-x86_64 centos-6-x64 -2015-04-01 13:06:31 [-] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_13_09_48/sut.log b/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_13_09_48/sut.log deleted file mode 100644 index faef5bda6..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_13_09_48/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-01 13:09:49 [+] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_13_41_36/sut.log b/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_13_41_36/sut.log deleted file mode 100644 index 92d6f6b9c..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_13_41_36/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-01 13:41:37 [+] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_15_16_35/sut.log b/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_15_16_35/sut.log deleted file mode 100644 index afcc1537e..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-01_15_16_35/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-01 15:16:36 [+] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_13_01/sut.log b/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_13_01/sut.log deleted file mode 100644 index e64bae971..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_13_01/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-02 13:13:03 [+] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_17_34/sut.log b/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_17_34/sut.log deleted file mode 100644 index 8ddbffa4c..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_17_34/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-02 13:17:36 [+] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_35_46/sut.log b/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_35_46/sut.log deleted file mode 100644 index 2c4748c76..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_35_46/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-02 13:35:48 [+] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_46_30/sut.log b/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_46_30/sut.log deleted file mode 100644 index 75abf14e9..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_46_30/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-02 13:46:33 [+] docker el-6-x86_64 centos-6-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_01_25/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_01_25/sut.log deleted file mode 100644 index 090ad2e41..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_01_25/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-02 10:03:18 [+] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_11_32/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_11_32/sut.log deleted file mode 100644 index 43158b97a..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_11_32/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-02 10:11:33 [+] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_23_54/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_23_54/sut.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_43_22/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_43_22/sut.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_52_46/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_52_46/sut.log deleted file mode 100644 index f30319971..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_52_46/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-02 10:53:42 [+] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_59_12/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_59_12/sut.log deleted file mode 100644 index c6efdee5e..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_59_12/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-02 10:59:14 [+] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-07_11_27_50/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-07_11_27_50/sut.log deleted file mode 100644 index d5c38ab30..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-07_11_27_50/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-04-07 11:27:52 [+] docker el-7-x86_64 centos-7-x64 -2015-04-07 12:00:29 [-] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-07_21_10_14/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-07_21_10_14/sut.log deleted file mode 100644 index a831e9f02..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-07_21_10_14/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-07 21:11:26 [+] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-07_21_30_33/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-07_21_30_33/sut.log deleted file mode 100644 index 60c72f08d..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-07_21_30_33/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-07 21:31:47 [+] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-08_12_40_12/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-08_12_40_12/sut.log deleted file mode 100644 index c08ba843c..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-08_12_40_12/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-04-08 12:40:13 [+] docker el-7-x86_64 centos-7-x64 -2015-04-08 12:53:37 [-] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_09_47_18/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_09_47_18/sut.log deleted file mode 100644 index 324c8dbe7..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_09_47_18/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-14 09:47:21 [+] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_09_47_40/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_09_47_40/sut.log deleted file mode 100644 index db7146141..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_09_47_40/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-04-14 09:47:43 [+] docker el-7-x86_64 centos-7-x64 -2015-04-14 09:59:57 [-] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_11_41_18/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_11_41_18/sut.log deleted file mode 100644 index 9ce63df05..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_11_41_18/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-04-14 11:41:19 [+] docker el-7-x86_64 centos-7-x64 -2015-04-14 11:57:29 [-] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_13_15_13/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_13_15_13/sut.log deleted file mode 100644 index 5f5280c37..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-14_13_15_13/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-04-14 13:15:14 [+] docker el-7-x86_64 centos-7-x64 -2015-04-14 13:27:46 [-] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_08_00/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_08_00/sut.log deleted file mode 100644 index 1d09e333d..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_08_00/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-04-15 15:08:03 [+] docker el-7-x86_64 centos-7-x64 -2015-04-15 15:12:24 [-] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_14_45/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_14_45/sut.log deleted file mode 100644 index c6257f7ac..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_14_45/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-15 15:14:48 [+] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_23_17/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_23_17/sut.log deleted file mode 100644 index f7c33d260..000000000 --- a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_23_17/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-15 15:23:20 [+] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_26_48/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-05-26_15_29_16/sut.log similarity index 100% rename from 3rdparty/modules/elasticsearch/log/centos-6-x64/2015-04-02_13_26_48/sut.log rename to 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-05-26_15_29_16/sut.log diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_09_58_58/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-05-26_15_30_01/sut.log similarity index 100% rename from 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_09_58_58/sut.log rename to 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-05-26_15_30_01/sut.log diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_12_51/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-05-26_15_31_34/sut.log similarity index 100% rename from 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_12_51/sut.log rename to 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-05-26_15_31_34/sut.log diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_15_37/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-05-26_15_39_48/sut.log similarity index 100% rename from 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-02_10_15_37/sut.log rename to 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-05-26_15_39_48/sut.log diff --git a/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-05-26_15_55_33/sut.log b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-05-26_15_55_33/sut.log new file mode 100644 index 000000000..f601ac790 --- /dev/null +++ b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-05-26_15_55_33/sut.log @@ -0,0 +1,2 @@ +2015-05-26 15:55:40 [+] docker el-7-x86_64 centos-7-x64 +2015-05-26 16:01:48 [-] docker el-7-x86_64 centos-7-x64 diff --git a/3rdparty/modules/elasticsearch/log/debian-6-x64/2015-05-27_10_02_38/sut.log b/3rdparty/modules/elasticsearch/log/debian-6-x64/2015-05-27_10_02_38/sut.log new file mode 100644 index 000000000..e87ca83a4 --- /dev/null +++ b/3rdparty/modules/elasticsearch/log/debian-6-x64/2015-05-27_10_02_38/sut.log @@ -0,0 +1,2 @@ +2015-05-27 10:05:58 [+] docker debian-6-amd64 debian-6 +2015-05-27 10:17:24 [-] docker debian-6-amd64 debian-6 diff --git a/3rdparty/modules/elasticsearch/log/debian-7-x64/2015-04-02_13_54_36/sut.log b/3rdparty/modules/elasticsearch/log/debian-7-x64/2015-04-02_13_54_36/sut.log deleted file mode 100644 index 4fa66bcd4..000000000 --- a/3rdparty/modules/elasticsearch/log/debian-7-x64/2015-04-02_13_54_36/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-02 13:54:38 [+] docker debian-7-amd64 debian-7 diff --git a/3rdparty/modules/elasticsearch/log/debian-7-x64/2015-04-02_15_23_38/sut.log b/3rdparty/modules/elasticsearch/log/debian-7-x64/2015-04-02_15_23_38/sut.log deleted file mode 100644 index 4ffa1e5af..000000000 --- a/3rdparty/modules/elasticsearch/log/debian-7-x64/2015-04-02_15_23_38/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-02 15:23:40 [+] docker debian-7-amd64 debian-7 diff --git a/3rdparty/modules/elasticsearch/log/debian-7-x64/2015-05-26_17_15_46/sut.log b/3rdparty/modules/elasticsearch/log/debian-7-x64/2015-05-26_17_15_46/sut.log new file mode 100644 index 000000000..c78580805 --- /dev/null +++ b/3rdparty/modules/elasticsearch/log/debian-7-x64/2015-05-26_17_15_46/sut.log @@ -0,0 +1,2 @@ +2015-05-26 17:20:46 [+] docker debian-7-amd64 debian-7 +2015-05-26 17:33:24 [-] docker debian-7-amd64 debian-7 diff --git a/3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_05_54/sut.log b/3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_05_54/sut.log new file mode 100644 index 000000000..e117d5bf3 --- /dev/null +++ b/3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_05_54/sut.log @@ -0,0 +1,2 @@ +2015-05-26 16:07:42 [+] docker debian-8-amd64 debian-8 +2015-05-26 16:14:19 [-] docker debian-8-amd64 debian-8 diff --git a/3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_16_38/sut.log b/3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_16_38/sut.log new file mode 100644 index 000000000..761c973e1 --- /dev/null +++ b/3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_16_38/sut.log @@ -0,0 +1 @@ +2015-05-26 16:16:44 [+] docker debian-8-amd64 debian-8 diff --git a/3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_34_43/sut.log b/3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_34_43/sut.log new file mode 100644 index 000000000..162821159 --- /dev/null +++ b/3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_34_43/sut.log @@ -0,0 +1,2 @@ +2015-05-26 16:38:58 [+] docker debian-8-amd64 debian-8 +2015-05-26 16:54:17 [-] docker debian-8-amd64 debian-8 diff --git a/3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_57_52/sut.log b/3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_57_52/sut.log new file mode 100644 index 000000000..0e3a509c5 --- /dev/null +++ b/3rdparty/modules/elasticsearch/log/debian-8-x64/2015-05-26_16_57_52/sut.log @@ -0,0 +1,2 @@ +2015-05-26 16:57:59 [+] docker debian-8-amd64 debian-8 +2015-05-26 17:13:35 [-] docker debian-8-amd64 debian-8 diff --git a/3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-14_13_30_41/sut.log b/3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-14_13_30_41/sut.log deleted file mode 100644 index 8c7d13df0..000000000 --- a/3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-14_13_30_41/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-04-14 13:30:42 [+] docker ubuntu-14.04-amd64 ubuntu-14-04 -2015-04-14 13:46:00 [-] docker ubuntu-14.04-amd64 ubuntu-14-04 diff --git a/3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-15_14_55_52/sut.log b/3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-15_14_55_52/sut.log deleted file mode 100644 index 38b70ba53..000000000 --- a/3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-15_14_55_52/sut.log +++ /dev/null @@ -1,2 +0,0 @@ -2015-04-15 14:55:57 [+] docker ubuntu-14.04-amd64 ubuntu-14-04 -2015-04-15 15:00:21 [-] docker ubuntu-14.04-amd64 ubuntu-14-04 diff --git a/3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-15_15_45_01/sut.log b/3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-15_15_45_01/sut.log deleted file mode 100644 index 042175afd..000000000 --- a/3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-15_15_45_01/sut.log +++ /dev/null @@ -1 +0,0 @@ -2015-04-15 15:45:06 [+] docker ubuntu-14.04-amd64 ubuntu-14-04 diff --git a/3rdparty/modules/elasticsearch/manifests/config.pp b/3rdparty/modules/elasticsearch/manifests/config.pp index 4a3ba64c9..3971afbc1 100644 --- a/3rdparty/modules/elasticsearch/manifests/config.pp +++ b/3rdparty/modules/elasticsearch/manifests/config.pp @@ -107,7 +107,7 @@ class elasticsearch::config { file { '/etc/init.d/elasticsearch': ensure => 'absent', } - file { '/usr/lib/systemd/system/elasticsearch.service': + file { '/lib/systemd/system/elasticsearch.service': ensure => 'absent', } diff --git a/3rdparty/modules/elasticsearch/manifests/init.pp b/3rdparty/modules/elasticsearch/manifests/init.pp index 9b7b40d29..20ff72293 100644 --- a/3rdparty/modules/elasticsearch/manifests/init.pp +++ b/3rdparty/modules/elasticsearch/manifests/init.pp @@ -163,6 +163,12 @@ # Enable Hiera's merging function for the plugins # Defaults to: false # +# [*package_pin*] +# Enables package version pinning. +# This pins the package version to the set version number and avoids +# package upgrades. +# Defaults to: true +# # The default values for the parameters are set in elasticsearch::params. Have # a look at the corresponding params.pp manifest file if you need more # technical information about them. @@ -197,6 +203,7 @@ class elasticsearch( $package_url = undef, $package_dir = $elasticsearch::params::package_dir, $package_name = $elasticsearch::params::package, + $package_pin = true, $purge_package_dir = $elasticsearch::params::purge_package_dir, $package_dl_timeout = $elasticsearch::params::package_dl_timeout, $elasticsearch_user = $elasticsearch::params::elasticsearch_user, @@ -227,7 +234,6 @@ class elasticsearch( ) inherits elasticsearch::params { anchor {'elasticsearch::begin': } - anchor {'elasticsearch::end': } #### Validate parameters @@ -330,7 +336,7 @@ class elasticsearch( distribution => 'jre', } - # ensure we first java java and then manage the service + # ensure we first install java, the package and then the rest Anchor['elasticsearch::begin'] -> Class['::java'] -> Class['elasticsearch::package'] @@ -373,10 +379,12 @@ class elasticsearch( -> Class['elasticsearch::config'] -> Elasticsearch::Instance <| |> -> Elasticsearch::Template <| |> + } else { # make sure all services are getting stopped before software removal - Elasticsearch::Instance <| |> + Anchor['elasticsearch::begin'] + -> Elasticsearch::Instance <| |> -> Class['elasticsearch::config'] -> Class['elasticsearch::package'] diff --git a/3rdparty/modules/elasticsearch/manifests/params.pp b/3rdparty/modules/elasticsearch/manifests/params.pp index 8b137bb41..3d1706f2a 100644 --- a/3rdparty/modules/elasticsearch/manifests/params.pp +++ b/3rdparty/modules/elasticsearch/manifests/params.pp @@ -133,34 +133,54 @@ class elasticsearch::params { # service parameters case $::operatingsystem { 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux', 'SLC': { + $service_name = 'elasticsearch' + $service_hasrestart = true + $service_hasstatus = true + $service_pattern = $service_name + $defaults_location = '/etc/sysconfig' + $pid_dir = '/var/run/elasticsearch' - case $::operatingsystemmajrelease { - '7': { - $init_template = 'elasticsearch.systemd.erb' - $service_providers = 'systemd' - } - default: { - $init_template = 'elasticsearch.RedHat.erb' - $service_providers = [ 'init' ] - } + if versioncmp($::operatingsystemmajrelease, '7') >= 0 { + $init_template = 'elasticsearch.systemd.erb' + $service_providers = 'systemd' + } else { + $init_template = 'elasticsearch.RedHat.erb' + $service_providers = 'init' } + } + 'Debian': { $service_name = 'elasticsearch' $service_hasrestart = true $service_hasstatus = true $service_pattern = $service_name - $defaults_location = '/etc/sysconfig' - $pid_dir = '/var/run/elasticsearch' + $defaults_location = '/etc/default' + if versioncmp($::operatingsystemmajrelease, '8') >= 0 { + $init_template = 'elasticsearch.systemd.erb' + $service_providers = 'systemd' + $pid_dir = '/var/run/elasticsearch' + } else { + $init_template = 'elasticsearch.Debian.erb' + $service_providers = [ 'init' ] + $pid_dir = false + } } - 'Debian', 'Ubuntu': { + 'Ubuntu': { $service_name = 'elasticsearch' $service_hasrestart = true $service_hasstatus = true $service_pattern = $service_name - $service_providers = 'init' $defaults_location = '/etc/default' - $init_template = 'elasticsearch.Debian.erb' - $pid_dir = false + + if versioncmp($::operatingsystemmajrelease, '15') >= 0 { + $init_template = 'elasticsearch.systemd.erb' + $service_providers = 'systemd' + $pid_dir = '/var/run/elasticsearch' + } else { + $init_template = 'elasticsearch.Debian.erb' + $service_providers = [ 'init' ] + $pid_dir = false + } } 'Darwin': { $service_name = 'FIXME/TODO' diff --git a/3rdparty/modules/elasticsearch/manifests/plugin.pp b/3rdparty/modules/elasticsearch/manifests/plugin.pp index f0166a371..9cd04484e 100644 --- a/3rdparty/modules/elasticsearch/manifests/plugin.pp +++ b/3rdparty/modules/elasticsearch/manifests/plugin.pp @@ -77,6 +77,7 @@ define elasticsearch::plugin( user => $elasticsearch::elasticsearch_user, tries => 6, try_sleep => 10, + timeout => 600, } $notify_service = $elasticsearch::restart_on_change ? { @@ -107,6 +108,12 @@ define elasticsearch::plugin( case $ensure { 'installed', 'present': { + $name_file_path = "${elasticsearch::plugindir}/${module_dir}/.name" + exec {"purge_plugin_${module_dir}_old": + command => "${elasticsearch::plugintool} --remove ${module_dir}", + onlyif => "test -e ${elasticsearch::plugindir}/${module_dir} && test \"$(cat ${name_file_path})\" != '${name}'", + before => Exec["install_plugin_${name}"], + } exec {"install_plugin_${name}": command => $install_cmd, creates => "${elasticsearch::plugindir}/${module_dir}", @@ -114,6 +121,11 @@ define elasticsearch::plugin( notify => $notify_service, require => File[$elasticsearch::plugindir], } + file {$name_file_path: + ensure => file, + content => $name, + require => Exec["install_plugin_${name}"], + } } default: { exec {"remove_plugin_${name}": diff --git a/3rdparty/modules/elasticsearch/manifests/repo.pp b/3rdparty/modules/elasticsearch/manifests/repo.pp index ba6a01dba..5144d9b62 100644 --- a/3rdparty/modules/elasticsearch/manifests/repo.pp +++ b/3rdparty/modules/elasticsearch/manifests/repo.pp @@ -75,4 +75,32 @@ class elasticsearch::repo { fail("\"${module_name}\" provides no repository information for OSfamily \"${::osfamily}\"") } } + + # Package pinning + if ($elasticsearch::package_pin == true and $elasticsearch::version != false) { + case $::osfamily { + 'Debian': { + if !defined(Class['apt']) { + class { 'apt': } + } + + apt::pin { $elasticsearch::package_name: + ensure => 'present', + packages => $elasticsearch::package_name, + version => $elasticsearch::version, + priority => 1000, + } + } + 'RedHat', 'Linux': { + + yum::versionlock { "0:elasticsearch-${elasticsearch::version}.noarch": + ensure => 'present', + } + } + default: { + fail("Unable to pin package for OSfamily \"${::osfamily}\"") + } + } + } + } diff --git a/3rdparty/modules/elasticsearch/manifests/service/systemd.pp b/3rdparty/modules/elasticsearch/manifests/service/systemd.pp index dee54e597..fb7912fbf 100644 --- a/3rdparty/modules/elasticsearch/manifests/service/systemd.pp +++ b/3rdparty/modules/elasticsearch/manifests/service/systemd.pp @@ -122,14 +122,15 @@ define elasticsearch::service::systemd( notify => $notify_service, } - } elsif ($init_defaults != undef and is_hash($init_defaults) ) { + } else { + if ($init_defaults != undef and is_hash($init_defaults) ) { - if(has_key($init_defaults, 'ES_USER')) { - if($init_defaults['ES_USER'] != $elasticsearch::elasticsearch_user) { - fail('Found ES_USER setting for init_defaults but is not same as elasticsearch_user setting. Please use elasticsearch_user setting.') + if(has_key($init_defaults, 'ES_USER')) { + if($init_defaults['ES_USER'] != $elasticsearch::elasticsearch_user) { + fail('Found ES_USER setting for init_defaults but is not same as elasticsearch_user setting. Please use elasticsearch_user setting.') + } } } - $init_defaults_pre_hash = { 'ES_USER' => $elasticsearch::elasticsearch_user, 'ES_GROUP' => $elasticsearch::elasticsearch_group, 'MAX_OPEN_FILES' => '65535' } $new_init_defaults = merge($init_defaults_pre_hash, $init_defaults) @@ -140,16 +141,29 @@ define elasticsearch::service::systemd( before => Service["elasticsearch-instance-${name}"], notify => $notify_service, } - } # init file from template if ($init_template != undef) { - $user = $elasticsearch::elasticsearch_user - $group = $elasticsearch::elasticsearch_group + $user = $elasticsearch::elasticsearch_user + $group = $elasticsearch::elasticsearch_group + $pid_dir = $elasticsearch::pid_dir + $defaults_location = $elasticsearch::defaults_location + + if ($new_init_defaults != undef and is_hash($new_init_defaults) and has_key($new_init_defaults, 'MAX_OPEN_FILES')) { + $nofile = $new_init_defaults['MAX_OPEN_FILES'] + }else{ + $nofile = '65535' + } + + if ($new_init_defaults != undef and is_hash($new_init_defaults) and has_key($new_init_defaults, 'MAX_LOCKED_MEMORY')) { + $memlock = $new_init_defaults['MAX_LOCKED_MEMORY'] + }else{ + $memlock = undef + } - file { "/usr/lib/systemd/system/elasticsearch-${name}.service": + file { "/lib/systemd/system/elasticsearch-${name}.service": ensure => $ensure, content => template($init_template), before => Service["elasticsearch-instance-${name}"], @@ -162,7 +176,7 @@ define elasticsearch::service::systemd( } elsif($status != 'unmanaged') { - file { "/usr/lib/systemd/system/elasticsearch-${name}.service": + file { "/lib/systemd/system/elasticsearch-${name}.service": ensure => 'absent', subscribe => Service["elasticsearch-instance-${name}"], notify => Exec["systemd_reload_${name}"], diff --git a/3rdparty/modules/elasticsearch/metadata.json b/3rdparty/modules/elasticsearch/metadata.json index eafcf7396..a6ba8963e 100644 --- a/3rdparty/modules/elasticsearch/metadata.json +++ b/3rdparty/modules/elasticsearch/metadata.json @@ -1,6 +1,6 @@ { "name": "elasticsearch-elasticsearch", - "version": "0.9.5", + "version": "0.9.6", "author": "elasticsearch", "summary": "Module for managing and configuring Elasticsearch nodes", "license": "Apache License, Version 2.0", @@ -45,7 +45,8 @@ "operatingsystem": "Debian", "operatingsystemrelease": [ "6", - "7" + "7", + "8" ] }, { @@ -67,7 +68,7 @@ "requirements": [ { "name": "pe", - "version_requirement": ">= 3.1.3" + "version_requirement": ">= 3.3.2" }, { "name": "puppet", diff --git a/3rdparty/modules/elasticsearch/templates/etc/init.d/elasticsearch.systemd.erb b/3rdparty/modules/elasticsearch/templates/etc/init.d/elasticsearch.systemd.erb index 5bdb6ba4c..2f5321df9 100644 --- a/3rdparty/modules/elasticsearch/templates/etc/init.d/elasticsearch.systemd.erb +++ b/3rdparty/modules/elasticsearch/templates/etc/init.d/elasticsearch.systemd.erb @@ -4,15 +4,19 @@ Documentation=http://www.elasticsearch.org [Service] Type=forking -EnvironmentFile=/etc/sysconfig/elasticsearch-<%= @name %> +EnvironmentFile=<%= @defaults_location %>/elasticsearch-<%= @name %> User=<%= @user %> Group=<%= @group %> -PIDFile=/var/run/elasticsearch/elasticsearch-<%= @name %>.pid -ExecStart=/usr/share/elasticsearch/bin/elasticsearch -d -p /var/run/elasticsearch/elasticsearch-<%= @name %>.pid -Des.default.config=$CONF_FILE -Des.default.path.home=$ES_HOME -Des.default.path.logs=$LOG_DIR -Des.default.path.data=$DATA_DIR -Des.default.path.work=$WORK_DIR -Des.default.path.conf=$CONF_DIR +PIDFile=<%= @pid_dir %>/elasticsearch-<%= @name %>.pid +ExecStart=/usr/share/elasticsearch/bin/elasticsearch -d -p <%= @pid_dir %>/elasticsearch-<%= @name %>.pid -Des.default.config=$CONF_FILE -Des.default.path.home=$ES_HOME -Des.default.path.logs=$LOG_DIR -Des.default.path.data=$DATA_DIR -Des.default.path.work=$WORK_DIR -Des.default.path.conf=$CONF_DIR # See MAX_OPEN_FILES in sysconfig -LimitNOFILE=65535 +LimitNOFILE=<%= @nofile %> # See MAX_LOCKED_MEMORY in sysconfig, use "infinity" when MAX_LOCKED_MEMORY=unlimited and using bootstrap.mlockall: true -#LimitMEMLOCK=infinity +<% if @memlock == 'unlimited' %> +LimitMEMLOCK=infinity +<% else %> +LimitMEMLOCK=<%= @memlock %> +<% end %> # Shutdown delay in seconds, before process is tried to be killed with KILL (if configured) TimeoutStopSec=20 -- 2.20.1