Make tests pass for Puppet 5 too

saz · Feb 24, 2018 · 96952d4 · 96952d4
1 parent 5c3821a
commit 96952d4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,10 @@ matrix:
     env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=rubocop
   - rvm: 2.3.1
     env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=build FORGEDEPLOY=true
+  - rvm: 2.3.1
+    env: PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes" CHECK=test
+  - rvm: 2.3.1
+    env: PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes" CHECK=rubocop
 notifications:
   email: false
 deploy:

diff --git a/manifests/server/host_key.pp b/manifests/server/host_key.pp
@@ -45,6 +45,10 @@
   $certificate_source = '',
   $certificate_content = '',
 ) {
+
+  # Ensure the ssh::server class is included in the manifest
+  include ::ssh::server
+
   if $public_key_source == '' and $public_key_content == '' and $ensure == 'present' {
     fail('You must provide either public_key_source or public_key_content parameter')
   }

diff --git a/metadata.json b/metadata.json
@@ -40,7 +40,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.10.10 < 5.0.0"
+      "version_requirement": ">= 4.10.10 < 6.0.0"
     }
   ],
   "name": "saz-ssh",