From 20aa7737ce2658a04b26e5dd27ae05725acf3fb5 Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Fri, 5 Mar 2021 20:58:03 -0500
Subject: [PATCH] Drop Puppet 5, support Puppet 7

---
 .github/workflows/ci.yaml | 34 +++++++++++++++++-----------------
 .sync.yml                 | 26 +++++++++++++-------------
 manifests/service.pp      |  9 +++------
 metadata.json             |  4 ++--
 4 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2a38fa1b..ac42dc29 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -15,22 +15,22 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: 2.4.9
-            puppet: 5
-            fixtures: .fixtures.yml
-            allow_failure: false
           - ruby: 2.5.7
             puppet: 6
             fixtures: .fixtures.yml
             allow_failure: false
-          - ruby: 2.4.9
-            puppet: 5
-            fixtures: .fixtures-latest.yml
-            allow_failure: true
+          - ruby: 2.7.0
+            puppet: 7
+            fixtures: .fixtures.yml
+            allow_failure: false
           - ruby: 2.5.7
             puppet: 6
             fixtures: .fixtures-latest.yml
             allow_failure: true
+          - ruby: 2.7.0
+            puppet: 7
+            fixtures: .fixtures-latest.yml
+            allow_failure: true
     env:
       BUNDLE_WITHOUT: system_tests:release
       PUPPET_GEM_VERSION: "~> ${{ matrix.puppet }}.0"
@@ -61,8 +61,8 @@ jobs:
           - "debian-10"
           - "ubuntu-1804"
         puppet:
-          - "puppet5"
           - "puppet6"
+          - "puppet7"
         keycloak_version:
           - "8.0.1"
           - "12.0.1"
@@ -72,35 +72,35 @@ jobs:
           - "no"
         include:
           - set: "centos-7"
-            puppet: "puppet5"
+            puppet: "puppet6"
             keycloak_version: "8.0.1"
             keycloak_full: "yes"
           - set: "centos-7"
-            puppet: "puppet5"
+            puppet: "puppet6"
             keycloak_version: "12.0.1"
             keycloak_full: "yes"
           - set: "centos-7"
-            puppet: "puppet6"
+            puppet: "puppet7"
             keycloak_version: "8.0.1"
             keycloak_full: "yes"
           - set: "centos-7"
-            puppet: "puppet6"
+            puppet: "puppet7"
             keycloak_version: "12.0.1"
             keycloak_full: "yes"
           - set: "centos-7-domain-mode-cluster"
-            puppet: "puppet5"
+            puppet: "puppet6"
             keycloak_version: "8.0.1"
             keycloak_domain_mode_cluster: "yes"
           - set: "centos-7-domain-mode-cluster"
-            puppet: "puppet5"
+            puppet: "puppet6"
             keycloak_version: "12.0.1"
             keycloak_domain_mode_cluster: "yes"
           - set: "centos-7-domain-mode-cluster"
-            puppet: "puppet6"
+            puppet: "puppet7"
             keycloak_version: "8.0.1"
             keycloak_domain_mode_cluster: "yes"
           - set: "centos-7-domain-mode-cluster"
-            puppet: "puppet6"
+            puppet: "puppet7"
             keycloak_version: "12.0.1"
             keycloak_domain_mode_cluster: "yes"
     env:
diff --git a/.sync.yml b/.sync.yml
index 0ee21977..e6d05c6b 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -2,14 +2,14 @@
 .github/workflows/ci.yaml:
   unit_name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }} fixtures=${{ matrix.fixtures }})
   unit_includes:
-    - ruby: '2.4.9'
-      puppet: '5'
-      fixtures: .fixtures-latest.yml
-      allow_failure: true
     - ruby: '2.5.7'
       puppet: '6'
       fixtures: .fixtures-latest.yml
       allow_failure: true
+    - ruby: '2.7.0'
+      puppet: '7'
+      fixtures: .fixtures-latest.yml
+      allow_failure: true
   acceptance_name: '${{ matrix.puppet }} ${{ matrix.set }} (keycloak=${{ matrix.keycloak_version }} full=${{ matrix.keycloak_full }})'
   acceptance_matrix:
     set:
@@ -19,8 +19,8 @@
       - debian-10
       - ubuntu-1804
     puppet:
-      - puppet5
       - puppet6
+      - puppet7
     keycloak_version:
       - '8.0.1'
       - '12.0.1'
@@ -28,35 +28,35 @@
     keycloak_domain_mode_cluster: ['no']
   acceptance_includes:
     - set: centos-7
-      puppet: puppet5
+      puppet: puppet6
       keycloak_version: 8.0.1
       keycloak_full: 'yes'
     - set: centos-7
-      puppet: puppet5
+      puppet: puppet6
       keycloak_version: 12.0.1
       keycloak_full: 'yes'
     - set: centos-7
-      puppet: puppet6
+      puppet: puppet7
       keycloak_version: 8.0.1
       keycloak_full: 'yes'
     - set: centos-7
-      puppet: puppet6
+      puppet: puppet7
       keycloak_version: 12.0.1
       keycloak_full: 'yes'
     - set: centos-7-domain-mode-cluster
-      puppet: puppet5
+      puppet: puppet6
       keycloak_version: 8.0.1
       keycloak_domain_mode_cluster: 'yes'
     - set: centos-7-domain-mode-cluster
-      puppet: puppet5
+      puppet: puppet6
       keycloak_version: 12.0.1
       keycloak_domain_mode_cluster: 'yes'
     - set: centos-7-domain-mode-cluster
-      puppet: puppet6
+      puppet: puppet7
       keycloak_version: 8.0.1
       keycloak_domain_mode_cluster: 'yes'
     - set: centos-7-domain-mode-cluster
-      puppet: puppet6
+      puppet: puppet7
       keycloak_version: 12.0.1
       keycloak_domain_mode_cluster: 'yes'
 .gitignore:
diff --git a/manifests/service.pp b/manifests/service.pp
index c8082b3c..9b1bccbb 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -2,12 +2,9 @@
 class keycloak::service {
   assert_private()
 
-  if $::service_provider == 'systemd' {
-    ::systemd::unit_file { 'keycloak.service':
-      content => template('keycloak/keycloak.service.erb'),
-      notify  => Service['keycloak'],
-    }
-    Exec['systemctl-daemon-reload'] -> Service['keycloak']
+  systemd::unit_file { 'keycloak.service':
+    content => template('keycloak/keycloak.service.erb'),
+    notify  => Service['keycloak'],
   }
 
   service { 'keycloak':
diff --git a/metadata.json b/metadata.json
index 800f2228..00cf0ddb 100644
--- a/metadata.json
+++ b/metadata.json
@@ -84,10 +84,10 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 5.0.0 < 7.0.0"
+      "version_requirement": ">= 6.0.0 < 8.0.0"
     }
   ],
   "pdk-version": "1.17.0",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
-  "template-ref": "heads/master-0-g1f52e6d"
+  "template-ref": "heads/master-0-gc21ae9d"
 }