From d67c8f5c00b1dc6a95ce030adf51add2197762ea Mon Sep 17 00:00:00 2001 From: Martin Zobel-Helas Date: Tue, 12 May 2015 17:18:04 +0000 Subject: [PATCH] Upgrade to 3rdparty version 0.9.5 of elasticsearch/elasticsearch Signed-off-by: Martin Zobel-Helas --- 3rdparty/Puppetfile | 2 +- 3rdparty/modules/elasticsearch/CHANGELOG.md | 21 +++++++++++++++++++ 3rdparty/modules/elasticsearch/Gemfile.lock | 6 +++--- 3rdparty/modules/elasticsearch/Modulefile | 2 +- 3rdparty/modules/elasticsearch/checksums.json | 15 ++++++++----- .../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-04-15_14_55_52/sut.log | 2 ++ .../2015-04-15_15_45_01/sut.log | 1 + .../modules/elasticsearch/manifests/repo.pp | 2 +- 3rdparty/modules/elasticsearch/metadata.json | 2 +- 12 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_08_00/sut.log create mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_14_45/sut.log create mode 100644 3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_23_17/sut.log create mode 100644 3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-15_14_55_52/sut.log create 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 12b07f30..ba64f072 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.4' +mod 'elasticsearch/elasticsearch', '0.9.5' diff --git a/3rdparty/modules/elasticsearch/CHANGELOG.md b/3rdparty/modules/elasticsearch/CHANGELOG.md index 4b905935..6b491bf0 100644 --- a/3rdparty/modules/elasticsearch/CHANGELOG.md +++ b/3rdparty/modules/elasticsearch/CHANGELOG.md @@ -1,3 +1,24 @@ +##0.9.5( Apr 16, 2015 ) + +###Summary +Bugfix release 0.9.5 + +We reverted the change that implemented the full 40 character for the apt repo key. +This caused issues with some older versions of the puppetlabs-apt module + +####Features + +####Bugfixes +* Revert using the full 40 character for the apt repo key. + +####Changes + +####Testing changes + +####Known bugs +* Possible package conflicts when using ruby/python defines with main package name + + ##0.9.4( Apr 14, 2015 ) ###Summary diff --git a/3rdparty/modules/elasticsearch/Gemfile.lock b/3rdparty/modules/elasticsearch/Gemfile.lock index 84645cc7..5965167d 100644 --- a/3rdparty/modules/elasticsearch/Gemfile.lock +++ b/3rdparty/modules/elasticsearch/Gemfile.lock @@ -186,7 +186,7 @@ GEM fog-core nokogiri (~> 1.5, >= 1.5.11) formatador (0.2.5) - google-api-client (0.8.5) + google-api-client (0.8.6) activesupport (>= 3.2) addressable (~> 2.3) autoparse (~> 0.3) @@ -268,7 +268,7 @@ GEM puppet-lint (~> 1.0) puppet-syntax (2.0.0) rake - puppetlabs_spec_helper (0.10.1) + puppetlabs_spec_helper (0.10.2) mocha puppet-lint puppet-syntax @@ -318,7 +318,7 @@ GEM slop (3.6.0) spdx-licenses (1.0.0) json - specinfra (2.28.1) + specinfra (2.28.2) net-scp net-ssh thread_safe (0.3.5) diff --git a/3rdparty/modules/elasticsearch/Modulefile b/3rdparty/modules/elasticsearch/Modulefile index 11f1c50e..87dd04af 100644 --- a/3rdparty/modules/elasticsearch/Modulefile +++ b/3rdparty/modules/elasticsearch/Modulefile @@ -1,5 +1,5 @@ name 'elasticsearch-elasticsearch' -version '0.9.4' +version '0.9.5' source 'https://github.com/elastic/puppet-elasticsearch' author 'elasticsearch' license 'Apache License, Version 2.0' diff --git a/3rdparty/modules/elasticsearch/checksums.json b/3rdparty/modules/elasticsearch/checksums.json index dfaa8fb3..de63f3a1 100644 --- a/3rdparty/modules/elasticsearch/checksums.json +++ b/3rdparty/modules/elasticsearch/checksums.json @@ -1,11 +1,11 @@ { - "CHANGELOG.md": "9ba84b10cf0f5e46c5ecaa1c5e3c0b12", + "CHANGELOG.md": "b222ad963d1cf385a91269aefab25e3a", "CONTRIBUTING.md": "c2985e231626a62f65cb661eaa346794", "CONTRIBUTORS": "14df2fd27cf7b6ca9833527f2ba93442", "Gemfile": "2a7c1a11ce3e71d8e644c4966583908f", - "Gemfile.lock": "3793e259a80fd7ad59d6eb42968c7c99", + "Gemfile.lock": "c7f79ae0acd1d0a5fdc4237af788f5b5", "LICENSE": "0e0bfc0e5636afdb297a2aa49d8d933d", - "Modulefile": "8337aad0f4b6a506e246c437457f719e", + "Modulefile": "185af8836eba1d107a4efc320b9b99af", "README.md": "910dd00a5cd96ca706f38270ebdb3d2e", "lib/facter/es_facts.rb": "b4b33e1047d659e45cb2590402f4b376", "lib/puppet/parser/functions/array_suffix.rb": "f4d8cfd448698eb9594f49bb2ed3c263", @@ -47,9 +47,14 @@ "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", "manifests/instance.pp": "ad2f1684674d4004c42f85c45a42d966", @@ -57,14 +62,14 @@ "manifests/params.pp": "2d1315c5466f27ec59b6296996a68e44", "manifests/plugin.pp": "e45b7ae5fb70ad25da7878a1c8bbb980", "manifests/python.pp": "109f076fea175ffef78da479952dc1a0", - "manifests/repo.pp": "f001f79d28d28c93d018e9f00b547034", + "manifests/repo.pp": "564034ff40e9703e9aa03d3d32c94e8e", "manifests/ruby.pp": "dd72a2538e23bba1c47618c9b3e6d66f", "manifests/script.pp": "8eaad1494fb7de63c65720400bad7442", "manifests/service/init.pp": "dc6817e1414e59f1fe23470c38a03c5d", "manifests/service/systemd.pp": "1f69c7e366958dfbdd2034f38c86ee25", "manifests/service.pp": "b34e3bb5a3984de44c9ad2566734576e", "manifests/template.pp": "35efdc655772908976df3c69338188fd", - "metadata.json": "6832a29ee56d4cf6e4555305a2836716", + "metadata.json": "1c3a14177ead8218923ef00c822a4ccf", "templates/etc/elasticsearch/elasticsearch.yml.erb": "08529839471ef1fac3a9f4a169ec5da8", "templates/etc/elasticsearch/logging.yml.erb": "99062dbf00c6b96d9bec7382dadafb9d", "templates/etc/init.d/elasticsearch.Debian.erb": "e7a586b5fd921ec6819936f44694f4c2", 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 new file mode 100644 index 00000000..1d09e333 --- /dev/null +++ b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_08_00/sut.log @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..c6257f7a --- /dev/null +++ b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_14_45/sut.log @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000..f7c33d26 --- /dev/null +++ b/3rdparty/modules/elasticsearch/log/centos-7-x64/2015-04-15_15_23_17/sut.log @@ -0,0 +1 @@ +2015-04-15 15:23:20 [+] docker el-7-x86_64 centos-7-x64 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 new file mode 100644 index 00000000..38b70ba5 --- /dev/null +++ b/3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-15_14_55_52/sut.log @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..042175af --- /dev/null +++ b/3rdparty/modules/elasticsearch/log/ubuntu-server-1404-x64/2015-04-15_15_45_01/sut.log @@ -0,0 +1 @@ +2015-04-15 15:45:06 [+] docker ubuntu-14.04-amd64 ubuntu-14-04 diff --git a/3rdparty/modules/elasticsearch/manifests/repo.pp b/3rdparty/modules/elasticsearch/manifests/repo.pp index 51503779..ba6a01db 100644 --- a/3rdparty/modules/elasticsearch/manifests/repo.pp +++ b/3rdparty/modules/elasticsearch/manifests/repo.pp @@ -40,7 +40,7 @@ class elasticsearch::repo { location => "http://packages.elasticsearch.org/elasticsearch/${elasticsearch::repo_version}/debian", release => 'stable', repos => 'main', - key => '46095ACC8548582C1A2699A9D27D666CD88E42B4', + key => 'D88E42B4', key_source => 'http://packages.elasticsearch.org/GPG-KEY-elasticsearch', include_src => false, } diff --git a/3rdparty/modules/elasticsearch/metadata.json b/3rdparty/modules/elasticsearch/metadata.json index 03e6b9f8..eafcf739 100644 --- a/3rdparty/modules/elasticsearch/metadata.json +++ b/3rdparty/modules/elasticsearch/metadata.json @@ -1,6 +1,6 @@ { "name": "elasticsearch-elasticsearch", - "version": "0.9.4", + "version": "0.9.5", "author": "elasticsearch", "summary": "Module for managing and configuring Elasticsearch nodes", "license": "Apache License, Version 2.0", -- 2.39.2