From 1d67f3aa257990512c02147174a5709b4c41efa0 Mon Sep 17 00:00:00 2001
From: Robert Detjens <detjensrobert@gmail.com>
Date: Tue, 10 Aug 2021 00:50:04 -0700
Subject: [PATCH] Enable unified_mode for Chef 17 compatibility (#120)

* Enable unified_mode for Chef 17 compatibility

Signed-off-by: Robert Detjens <detjensrobert@osuosl.org>

* remove EOL platform from CI

Signed-off-by: Robert Detjens <detjensrobert@osuosl.org>
---
 .github/workflows/ci.yml | 1 -
 CHANGELOG.md             | 2 ++
 README.md                | 2 +-
 kitchen.dokken.yml       | 7 -------
 kitchen.yml              | 3 ++-
 metadata.rb              | 2 +-
 resources/install.rb     | 2 ++
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3aab865..213a176 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,6 @@ jobs:
           - 'centos-7'
           - 'centos-8'
           - 'fedora-latest'
-          - 'ubuntu-1604'
           - 'ubuntu-1804'
           - 'ubuntu-2004'
           - 'opensuse-leap-15'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 565cb01..39df1f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Enable `unified_mode` for Chef 17 compatiblity
+
 ## 5.0.1 - *2021-06-01*
 
 ## 5.0.0 - *2020-12-14*
diff --git a/README.md b/README.md
index 2dc749c..8bbc29e 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ This cookbook is maintained by the Sous Chefs. The Sous Chefs are a community of
 
 ### Chef
 
-- Chef 12.15+
+- Chef 15.3+
 
 ### Cookbooks
 
diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml
index ef54e90..4a000af 100644
--- a/kitchen.dokken.yml
+++ b/kitchen.dokken.yml
@@ -49,13 +49,6 @@ platforms:
       image: dokken/fedora-latest
       pid_one_command: /usr/lib/systemd/systemd
 
-  - name: ubuntu-16.04
-    driver:
-      image: dokken/ubuntu-16.04
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-
   - name: ubuntu-18.04
     driver:
       image: dokken/ubuntu-18.04
diff --git a/kitchen.yml b/kitchen.yml
index a7c63aa..c7bbf9f 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -4,6 +4,7 @@ driver:
 provisioner:
   name: chef_zero
   product_name: chef
+  chef_license: accept-no-persist
   enforce_idempotency: true
   multiple_converge: 2
   deprecations_as_errors: true
@@ -18,8 +19,8 @@ platforms:
   - name: debian-9
   - name: debian-10
   - name: fedora-latest
-  - name: ubuntu-16.04
   - name: ubuntu-18.04
+  - name: ubuntu-20.04
   - name: freebsd-12
 
 suites:
diff --git a/metadata.rb b/metadata.rb
index 89bf2e0..bb21138 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -6,7 +6,7 @@
 version           '5.0.1'
 source_url        'https://github.com/sous-chefs/openldap'
 issues_url        'https://github.com/sous-chefs/openldap/issues'
-chef_version      '>= 12.15'
+chef_version      '>= 15.3'
 
 supports 'amazon'
 supports 'centos'
diff --git a/resources/install.rb b/resources/install.rb
index 3edfc7d..03a05e6 100644
--- a/resources/install.rb
+++ b/resources/install.rb
@@ -1,3 +1,5 @@
+unified_mode true
+
 property :package_action, Symbol, default: :install
 property :install_client, [true, false], default: true, description: 'Install openldap client package(s)'
 property :install_server, [true, false], default: true, description: 'Install openldap server package(s)'