From f9550720eda443c93b674a3192fc7771013667a3 Mon Sep 17 00:00:00 2001
From: Phil Friderici <phil.friderici@ericsson.com>
Date: Wed, 5 Dec 2018 08:04:43 +0000
Subject: [PATCH] Add support for Puppet 6

---
 .fixtures-puppetv3.yml | 16 ++++++++++++++++
 .fixtures.yml          |  3 +++
 .travis.yml            | 18 ++++++++++--------
 metadata.json          |  5 +++--
 4 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 .fixtures-puppetv3.yml

diff --git a/.fixtures-puppetv3.yml b/.fixtures-puppetv3.yml
new file mode 100644
index 0000000..e8a1576
--- /dev/null
+++ b/.fixtures-puppetv3.yml
@@ -0,0 +1,16 @@
+fixtures:
+  repositories:
+    stdlib:
+      repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
+      ref: '4.6.0'
+    concat:
+      repo: 'https://github.com/puppetlabs/puppetlabs-concat.git'
+      ref: '2.2.1'
+    common:
+      repo: 'https://github.com/ghoneycutt/puppet-module-common.git'
+      ref: 'v1.4.1'
+    firewall:
+      repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git'
+      ref: '1.9.0'
+  symlinks:
+    ssh: "#{source_dir}"
diff --git a/.fixtures.yml b/.fixtures.yml
index e8a1576..91a33d7 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -12,5 +12,8 @@ fixtures:
     firewall:
       repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git'
       ref: '1.9.0'
+    sshkeys:
+      repo: 'git://github.com/puppetlabs/puppetlabs-sshkeys_core.git'
+      ref: '1.0.1'
   symlinks:
     ssh: "#{source_dir}"
diff --git a/.travis.yml b/.travis.yml
index 18ed460..81e06f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,25 +19,27 @@ matrix:
   fast_finish: true
   include:
   - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml"
   - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" FUTURE_PARSER="yes"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" FUTURE_PARSER="yes"
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml"
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" FUTURE_PARSER="yes"
   - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 3"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml"
   - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" FUTURE_PARSER="yes"
   - rvm: 2.1.9
     env: PUPPET_GEM_VERSION="~> 4"
   - rvm: 2.4.1
     env: PUPPET_GEM_VERSION="~> 5"
+  - rvm: 2.5.1
+    env: PUPPET_GEM_VERSION="~> 6"
 
 notifications:
   email: false
diff --git a/metadata.json b/metadata.json
index 8d8fc2b..fe7443f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,7 +10,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 3.0.0 < 6.0.0"
+      "version_requirement": ">= 3.0.0 < 7.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -90,6 +90,7 @@
     {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"},
     {"name":"puppetlabs/concat","version_requirement":">= 2.0.0 < 6.0.0"},
     {"name":"ghoneycutt/common","version_requirement":">= 1.4.1 < 2.0.0"},
-    {"name":"puppetlabs/firewall","version_requirement":">= 1.9.0 < 2.0.0"}
+    {"name":"puppetlabs/firewall","version_requirement":">= 1.9.0 < 2.0.0"},
+    {"name":"puppetlabs/sshkeys_core","version_requirement":">= 1.0.1 <2.0.0"}
   ]
 }