From ee28b08a57a486e87be5157bfb40b07683f5dda8 Mon Sep 17 00:00:00 2001
From: Lance Albertson <lance@osuosl.org>
Date: Thu, 14 Oct 2021 09:01:42 -0700
Subject: [PATCH] Chef 17 support

- Require Chef >= 16.0
- Update to latest upstream mariadb cookbook
- Update copyright years

Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-common/+/813952
Change-Id: I4b0417acb75f10dd9a1c0a22fadcd1d849f045b9
Signed-off-by: Lance Albertson <lance@osuosl.org>
---
 .rubocop.yml            | 4 ++++
 README.rst              | 8 ++++----
 attributes/default.rb   | 2 +-
 metadata.rb             | 4 ++--
 recipes/client.rb       | 4 ++--
 recipes/openstack-db.rb | 2 +-
 recipes/server.rb       | 4 ++--
 7 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 0000000..389f270
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,4 @@
+Chef/Modernize/FoodcriticComments:
+  Enabled: true
+Chef/Style/CopyrightCommentFormat:
+  Enabled: true
diff --git a/README.rst b/README.rst
index 7f4f1d5..91767d6 100644
--- a/README.rst
+++ b/README.rst
@@ -14,8 +14,8 @@ supports MariaDB.
 Requirements
 ============
 
-- Chef 15 or higher
-- Chef Workstation 21.2.303 for testing (also includes Berkshelf for cookbook
+- Chef 16 or higher
+- Chef Workstation 21.10.640 for testing (also includes Berkshelf for cookbook
   dependency resolution)
 
 Platforms
@@ -30,7 +30,7 @@ Cookbooks
 
 The following cookbooks are dependencies:
 
-- 'mariadb', '~> 4.0'
+- 'mariadb', '~> 5.0'
 - 'openstack-common', '~> 20.0.0'
 
 Usage
@@ -186,7 +186,7 @@ License and Author
 +-----------------+---------------------------------------------------+
 | **Copyright**   | Copyright (c) 2014-2015, IBM, Corp.               |
 +-----------------+---------------------------------------------------+
-| **Copyright**   | Copyright (c) 2019-2020, Oregon State University  |
+| **Copyright**   | Copyright (c) 2019-2021, Oregon State University  |
 +-----------------+---------------------------------------------------+
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/attributes/default.rb b/attributes/default.rb
index e55a9c7..36b0482 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -2,7 +2,7 @@
 # Cookbook:: openstack-ops-database
 # Recipe:: default
 #
-# Copyright:: 2013, AT&T Services, Inc.
+# Copyright:: 2013-2021, AT&T Services, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/metadata.rb b/metadata.rb
index 97753a6..28b4c07 100755
--- a/metadata.rb
+++ b/metadata.rb
@@ -11,8 +11,8 @@ end
 
 depends 'openstack-common', '>= 20.0.0'
 
-depends 'mariadb', '~> 4.0'
+depends 'mariadb', '~> 5.0'
 
 issues_url 'https://launchpad.net/openstack-chef'
 source_url 'https://opendev.org/openstack/cookbook-openstack-ops-database'
-chef_version '>= 15.0'
+chef_version '>= 16.0'
diff --git a/recipes/client.rb b/recipes/client.rb
index 1175f42..84b160b 100644
--- a/recipes/client.rb
+++ b/recipes/client.rb
@@ -2,8 +2,8 @@
 # Cookbook:: openstack-ops-database
 # Recipe:: client
 #
-# Copyright:: 2013, Opscode, Inc.
-# Copyright:: 2013, AT&T Services, Inc.
+# Copyright:: 2013-2021, Chef Software, Inc.
+# Copyright:: 2013-2021, AT&T Services, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/recipes/openstack-db.rb b/recipes/openstack-db.rb
index fde6d5a..d7e1412 100644
--- a/recipes/openstack-db.rb
+++ b/recipes/openstack-db.rb
@@ -2,7 +2,7 @@
 # Cookbook:: openstack-ops-database
 # Recipe:: openstack-db
 #
-# Copyright:: 2012-2013, AT&T Services, Inc.
+# Copyright:: 2012-2021, AT&T Services, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/recipes/server.rb b/recipes/server.rb
index 31bb6fe..e80ebd4 100644
--- a/recipes/server.rb
+++ b/recipes/server.rb
@@ -2,8 +2,8 @@
 # Cookbook:: openstack-ops-database
 # Recipe:: server
 #
-# Copyright:: 2013, Opscode, Inc.
-# Copyright:: 2013, AT&T Services, Inc.
+# Copyright:: 2013-2021, Chef Software, Inc.
+# Copyright:: 2013-2021, AT&T Services, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.