Merge branch 'master' into pr/1036

Author: tylerjl

.fixtures.yml

@@ -3,6 +3,9 @@ fixtures:
     archive:
       repo: puppet/archive
       ref: 0.5.1
+    augeas_core:
+      repo: puppetlabs/augeas_core
+      ref: 1.0.4
     stdlib:
       repo: puppetlabs/stdlib
       ref: 4.13.1
@@ -19,8 +22,11 @@ fixtures:
       repo: puppetlabs/apt
       ref: 2.2.2
     zypprepo:
-      repo: darin/zypprepo
-      ref: 1.0.2
+      repo: puppet/zypprepo
+      ref: 2.2.2
+    yumrepo_core:
+      repo: puppetlabs/yumrepo_core
+      ref: 1.0.3
     java_ks: puppetlabs/java_ks
     elastic_stack:
       repo: elastic/elastic_stack

.travis.yml

@@ -14,13 +14,28 @@ jobs:
   - env:
     - TASK=beaker:ubuntu-server-1404-x64:snapshot
   - env:
+    - OSS_PACKAGE=true
+    - TASK=beaker:ubuntu-server-1404-x64:snapshot
+  - env:
+    - TASK=beaker:ubuntu-server-1604-x64:snapshot
+  - env:
+    - OSS_PACKAGE=true
     - TASK=beaker:ubuntu-server-1604-x64:snapshot
   - env:
     - TASK=beaker:centos-6-x64:snapshot
   - env:
+    - OSS_PACKAGE=true
+    - TASK=beaker:centos-6-x64:snapshot
+  - env:
+    - TASK=beaker:centos-7-x64:snapshot
+  - env:
+    - OSS_PACKAGE=true
     - TASK=beaker:centos-7-x64:snapshot
   - env:
     - TASK=beaker:debian-8-x64:snapshot
+  - env:
+    - OSS_PACKAGE=true
+    - TASK=beaker:debian-8-x64:snapshot
   - env:
     - TASK=beaker:debian-9-x64:snapshot
   - env:
@@ -36,6 +51,9 @@ jobs:
   - env:
     - TASK=intake
     - PUPPET_VERSION='~> 5.0'
+  - env:
+    - TASK=intake
+    - PUPPET_VERSION='~> 6.0'
   - stage: acceptance
     env:
     - TASK=beaker:centos-6-x64:acceptance
@@ -67,12 +85,6 @@ jobs:
     - TASK=beaker:oracle-7-x64:acceptance[5.6.9]
   - env:
     - TASK=beaker:oracle-7-x64:acceptance[2.4.6]
-  - env:
-    - TASK=beaker:opensuse-42-x64:acceptance
-  - env:
-    - TASK=beaker:opensuse-42-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:opensuse-42-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:debian-8-x64:acceptance
   - env:

CHANGELOG.md

@@ -1,6 +1,11 @@
 ## x.x.x (Month Day, Year)
 
-### Migration Guide
+#### Features
+* Support for Puppet 6
+
+#### Fixes
+
+## 6.3.4 (August 7, 2019)
 
 #### Puppet < 4.10 No Longer Supported
 
@@ -13,8 +18,6 @@ Puppet 4.10.0 is the new minimum required version of Puppet.
 * An error related to elasticsearch_roles and `yield` errors has been fixed
 * Correctly permit instances to be set to `absent` without errors.
 
-#### Features
-
 ## 6.3.3 (September 7, 2018)
 
 Note that this release includes changes to a default value that may affect users that rely on `curl` or `wget` to retrieve Elasticsearch package files, as now all certificates are validated by default.

README.md

@@ -56,7 +56,7 @@ When using the repository management, the following module dependencies are requ
 
 * General: [Elastic/elastic_stack](https://forge.puppet.com/elastic/elastic_stack)
 * Debian/Ubuntu: [Puppetlabs/apt](https://forge.puppetlabs.com/puppetlabs/apt)
-* OpenSuSE/SLES: [Darin/zypprepo](https://forge.puppetlabs.com/darin/zypprepo)
+* OpenSuSE/SLES: [puppet/zypprepo](https://forge.puppetlabs.com/puppet/zypprepo)
 
 ### Beginning with Elasticsearch
 

manifests/service/systemd.pp

@@ -179,6 +179,7 @@
       ensure => 'file',
       owner  => 'root',
       group  => 'root',
+      mode   => '0644',
       before => Service["elasticsearch-instance-${name}"],
       notify => $notify_service,
     }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "elastic-elasticsearch",
-  "version": "6.3.3",
+  "version": "6.3.4",
   "source": "https://github.com/elastic/puppet-elasticsearch",
   "author": "elastic",
   "license": "Apache-2.0",
@@ -19,7 +19,7 @@
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.0 < 6.0.0"
+      "version_requirement": ">= 4.13.0 < 7.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -69,12 +69,6 @@
         "16.04"
       ]
     },
-    {
-      "operatingsystem": "OpenSuSE",
-      "operatingsystemrelease": [
-        "42.2"
-      ]
-    },
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
@@ -86,7 +80,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.10.0 < 6.0.0"
+      "version_requirement": ">= 4.10.0 < 7.0.0"
     }
   ]
 }

spec/acceptance/nodesets/debian-8-x64.yml

@@ -5,12 +5,14 @@ HOSTS:
       - database
       - dashboard
     platform: debian-8-amd64
-    image: debian:8
+    image: debian:8.11
     hypervisor: docker
     docker_cmd: ["/bin/systemd"]
     docker_preserve_image: true
     docker_image_commands:
-      - echo 'deb http://ftp.debian.org/debian jessie-backports main' >> /etc/apt/sources.list
+      - echo 'deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main' >> /etc/apt/sources.list
+      - echo 'Acquire::Check-Valid-Until "false";' >> /etc/apt/apt.conf
+      - sed -i '/jessie.updates/d' /etc/apt/sources.list
       - apt-get update
       - apt-get install -yq -t jessie-backports openjdk-8-jre-headless
       - apt-get install -yq wget net-tools apt-transport-https

spec/acceptance/nodesets/opensuse-42-x64.yml

@@ -5,16 +5,16 @@ OS:
   - centos-7-x64
   - debian-8-x64
   - debian-9-x64
-  - opensuse-42-x64
   - oracle-6-x64
   - oracle-7-x64
   - ubuntu-server-1404-x64
   - ubuntu-server-1604-x64
 PUPPET_VERSION:
   - ""
+  - "~> 6.0"
   - "~> 5.0"
   - "~> 4.10.0"
 TEST_TYPE:
   - latest
   - 5.6.9
-  - snapshot
+#  - snapshot

spec/matrix.yml

@@ -231,12 +231,12 @@ class { 'elasticsearch':
     ] + Beaker::DSL::InstallUtils::ModuleUtils::PUPPET_MODULE_INSTALL_IGNORE
 
     hosts.each do |host|
-      modules = %w[archive datacat java java_ks stdlib elastic_stack]
+      modules = %w[archive augeas_core datacat java java_ks stdlib elastic_stack]
 
       dist_module = {
         'Debian' => ['apt'],
         'Suse'   => ['zypprepo'],
-        'RedHat' => ['concat']
+        'RedHat' => %w[concat yumrepo_core]
       }[f['os']['family']]
 
       modules += dist_module unless dist_module.nil?