Merge branch 'master' into fix-opensuse-spelling

Author: ghoneycutt

.fixtures.yml

@@ -11,7 +11,7 @@ fixtures:
       ref: 4.13.1
     java:
       repo: puppetlabs/java
-      ref: 2.0.0
+      ref: 6.5.0
     concat:
       repo: puppetlabs/concat
       ref: 2.2.1
@@ -20,7 +20,7 @@ fixtures:
       ref: 0.6.2
     apt:
       repo: puppetlabs/apt
-      ref: 2.2.2
+      ref: 7.4.1
     zypprepo:
       repo: puppet/zypprepo
       ref: 2.2.2

.travis.yml

@@ -4,6 +4,28 @@
 
 #### Fixes
 
+## 7.0.0 (December 23, 2020)
+
+This is a new major version release of the Elasticsearch module that contains a number of breaking changes and adds support for deploying
+and managing Elasticsearch 7.x.
+
+### Breaking changes
+* Removed support for running multiple instances of Elasticsearch on a single host
+* Removed support for Elasticsearch older than version 6.x
+
+### Features
+* Support for deploying Elasticsearch 7.x
+* Support and Testing for a number of newer OS'
+  * Amazon Linux 2
+  * CentOS 8
+  * Oracle Linux 8
+  * Debian 10
+  * Ubuntu 18.04
+  * Ubuntu 20.04
+
+### Bug fixes
+Various little bug fixes as a result of cleaning up and refactoring a lot of the code.
+
 ## 6.4.0 (August 28, 2019)
 
 #### Features

CHANGELOG.md

@@ -1,14 +1,14 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'puppet', (ENV['PUPPET_VERSION'] || '~> 4.10'), :require => false
+  gem 'puppet', (ENV['PUPPET_VERSION'] || '~> 6.0'), :require => false
 
   gem 'metadata-json-lint'
   gem 'specinfra', '~> 2.60'
   gem 'xmlrpc'
 
   gem 'ci_reporter_rspec'
-  gem 'facter'
+  gem 'facter', "~> 2.4"
   gem 'pry'
   gem 'puppet-lint'
   gem 'puppet-strings'
@@ -46,8 +46,12 @@ end
 
 group :system_tests do
   gem 'bcrypt'
-  gem 'beaker', '~> 3.7'
+  gem 'beaker', '>= 4.2.0'
   gem 'beaker-rspec', '~> 6.0'
+  gem 'beaker-docker'
+  gem 'beaker-puppet'
+  gem 'beaker-puppet_install_helper'
+  gem 'simp-beaker-helpers'
   gem 'docker-api', '~> 1.0'
   gem 'infrataster'
   gem 'vault'

CONTRIBUTING.md

@@ -157,7 +157,7 @@
       negligent acts) or agreed to in writing, shall any Contributor be
       liable to You for damages, including any direct, indirect, special,
       incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
+      result of this License or out of the use or inability to use thes
       Work (including but not limited to damages for loss of goodwill,
       work stoppage, computer failure or malfunction, or any and all
       other commercial damages or losses), even if such Contributor
@@ -173,30 +173,3 @@
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2012-2017 Elasticsearch
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.