From c9c7006775c08e5c4de9179ab357e4762388aad6 Mon Sep 17 00:00:00 2001
From: treydock <treydock@gmail.com>
Date: Mon, 12 Jul 2021 09:27:17 -0400
Subject: [PATCH] Support Keycloak 14 (#199)

---
 .github/workflows/ci.yaml             | 13 +++++--------
 .sync.yml                             | 13 +++++--------
 README.md                             |  2 +-
 metadata.json                         |  2 +-
 spec/acceptance/nodesets/centos-8.yml |  4 ++--
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index fc5393a5..97d17e4e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -67,6 +67,7 @@ jobs:
         keycloak_version:
           - "12.0.4"
           - "13.0.1"
+          - "14.0.0"
         keycloak_full:
           - "no"
         keycloak_domain_mode_cluster:
@@ -81,28 +82,24 @@ jobs:
             keycloak_version: "12.0.4"
             keycloak_full: "yes"
           - set: "centos-7"
-            puppet: "puppet6"
+            puppet: "puppet7"
             keycloak_version: "13.0.1"
             keycloak_full: "yes"
           - set: "centos-7"
             puppet: "puppet7"
-            keycloak_version: "13.0.1"
+            keycloak_version: "14.0.0"
             keycloak_full: "yes"
-          - set: "centos-7-domain-mode-cluster"
-            puppet: "puppet6"
-            keycloak_version: "12.0.4"
-            keycloak_domain_mode_cluster: "yes"
           - set: "centos-7-domain-mode-cluster"
             puppet: "puppet7"
             keycloak_version: "12.0.4"
             keycloak_domain_mode_cluster: "yes"
           - set: "centos-7-domain-mode-cluster"
-            puppet: "puppet6"
+            puppet: "puppet7"
             keycloak_version: "13.0.1"
             keycloak_domain_mode_cluster: "yes"
           - set: "centos-7-domain-mode-cluster"
             puppet: "puppet7"
-            keycloak_version: "13.0.1"
+            keycloak_version: "14.0.0"
             keycloak_domain_mode_cluster: "yes"
     env:
       BUNDLE_WITHOUT: development:release
diff --git a/.sync.yml b/.sync.yml
index 0ae275a1..1f45c80e 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -25,6 +25,7 @@
     keycloak_version:
       - '12.0.4'
       - '13.0.1'
+      - '14.0.0'
     keycloak_full: ['no']
     keycloak_domain_mode_cluster: ['no']
   acceptance_includes:
@@ -37,28 +38,24 @@
       keycloak_version: 12.0.4
       keycloak_full: 'yes'
     - set: centos-7
-      puppet: puppet6
+      puppet: puppet7
       keycloak_version: 13.0.1
       keycloak_full: 'yes'
     - set: centos-7
       puppet: puppet7
-      keycloak_version: 13.0.1
+      keycloak_version: 14.0.0
       keycloak_full: 'yes'
-    - set: centos-7-domain-mode-cluster
-      puppet: puppet6
-      keycloak_version: 12.0.4
-      keycloak_domain_mode_cluster: 'yes'
     - set: centos-7-domain-mode-cluster
       puppet: puppet7
       keycloak_version: 12.0.4
       keycloak_domain_mode_cluster: 'yes'
     - set: centos-7-domain-mode-cluster
-      puppet: puppet6
+      puppet: puppet7
       keycloak_version: 13.0.1
       keycloak_domain_mode_cluster: 'yes'
     - set: centos-7-domain-mode-cluster
       puppet: puppet7
-      keycloak_version: 13.0.1
+      keycloak_version: 14.0.0
       keycloak_domain_mode_cluster: 'yes'
 .gitignore:
   paths:
diff --git a/README.md b/README.md
index 9e1d9a4c..2aee09e2 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ This module may work on earlier versions but this is the only version tested.
 | 4.x - 6.x        | 3.x                             |
 | 6.x - 8.x        | 4.x - 5.x                       |
 | 8.x - 12.x       | 6.x                             |
-| 12.x - 13.x      | 7.x                             |
+| 12.x - 14.x      | 7.x                             |
 
 ## Usage
 
diff --git a/metadata.json b/metadata.json
index a1b63b5a..f2f0d143 100644
--- a/metadata.json
+++ b/metadata.json
@@ -90,5 +90,5 @@
   ],
   "pdk-version": "1.17.0",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
-  "template-ref": "heads/master-0-g3ae711a"
+  "template-ref": "heads/master-0-g4e040ab"
 }
diff --git a/spec/acceptance/nodesets/centos-8.yml b/spec/acceptance/nodesets/centos-8.yml
index 6ab64458..41e74e94 100644
--- a/spec/acceptance/nodesets/centos-8.yml
+++ b/spec/acceptance/nodesets/centos-8.yml
@@ -9,9 +9,9 @@ HOSTS:
     docker_cmd:
       - '/usr/sbin/init'
     docker_image_commands:
-      - 'yum install -y dnf-utils'
+      - 'dnf install -y dnf-utils'
       - 'dnf config-manager --set-enabled powertools'
-      - 'yum install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks'
+      - 'dnf install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks'
     docker_env:
       - LANG=en_US.UTF-8
       - LANGUAGE=en_US.UTF-8