From 21424d8868f863aef3ad1a9c9692483dc5fe70a8 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Thu, 14 Oct 2021 12:56:13 -0700 Subject: [PATCH] Chef 17 support - Remove bind from Berksfile - Update copyright years - Require Chef >= 16.0 Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-identity/+/814051 Change-Id: If07c6d8973bbba605756938f62d351cc323edd7b Signed-off-by: Lance Albertson --- .rubocop.yml | 4 ++++ Berksfile | 4 ---- README.rst | 6 +++--- attributes/default.rb | 6 +++--- metadata.rb | 2 +- recipes/agent-central.rb | 6 +++--- recipes/agent-compute.rb | 6 +++--- recipes/agent-notification.rb | 4 ++-- recipes/aodh.rb | 2 +- recipes/common.rb | 8 ++++---- recipes/gnocchi_configure.rb | 2 +- recipes/gnocchi_install.rb | 2 +- recipes/identity_registration.rb | 4 ++-- recipes/setup.rb | 2 +- 14 files changed, 29 insertions(+), 29 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/Berksfile b/Berksfile index 1b8c9be..f9254a8 100644 --- a/Berksfile +++ b/Berksfile @@ -21,8 +21,4 @@ solver :ruby, :required end end -# TODO(ramereth): Remove after this PR gets included in a release -# https://github.com/joyofhex/cookbook-bind/pull/60 -cookbook 'bind', github: 'joyofhex/cookbook-bind' - metadata diff --git a/README.rst b/README.rst index 4c04aa3..32f55e3 100644 --- a/README.rst +++ b/README.rst @@ -22,8 +22,8 @@ https://gnocchi.xyz/ Requirements ============ -- Chef 15 or higher -- Chef Workstation 21.2.303 for testing (also includes Berkshelf for +- Chef 16 or higher +- Chef Workstation 21.10.640 for testing (also includes Berkshelf for cookbook dependency resolution) Platform @@ -143,7 +143,7 @@ License and Author +-----------------+--------------------------------------------------+ | **Copyright** | Copyright (c) 2013-2014, SUSE Linux GmbH | +-----------------+--------------------------------------------------+ -| **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 8549925..4aa132f 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -2,9 +2,9 @@ # Cookbook:: openstack-telemetry # Recipe:: default # -# Copyright:: 2013, AT&T Services, Inc. -# Copyright:: 2013-2014, SUSE Linux GmbH -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2013-2021, AT&T Services, Inc. +# Copyright:: 2013-2021, SUSE Linux GmbH +# Copyright:: 2019-2021, Oregon State University # # 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 55e28d8..092eb93 100644 --- a/metadata.rb +++ b/metadata.rb @@ -16,4 +16,4 @@ depends 'openstack-identity', '>= 20.0.0' issues_url 'https://launchpad.net/openstack-chef' source_url 'https://opendev.org/openstack/cookbook-openstack-telemetry' -chef_version '>= 15.0' +chef_version '>= 16.0' diff --git a/recipes/agent-central.rb b/recipes/agent-central.rb index 5835da4..47af934 100644 --- a/recipes/agent-central.rb +++ b/recipes/agent-central.rb @@ -2,9 +2,9 @@ # Cookbook:: openstack-telemetry # Recipe:: agent-central # -# Copyright:: 2013, AT&T Services, Inc. -# Copyright:: 2013, SUSE Linux GmbH -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2013-2021, AT&T Services, Inc. +# Copyright:: 2013-2021, SUSE Linux GmbH +# Copyright:: 2019-2021, Oregon State University # # 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/agent-compute.rb b/recipes/agent-compute.rb index 16e6764..72e50fc 100644 --- a/recipes/agent-compute.rb +++ b/recipes/agent-compute.rb @@ -2,9 +2,9 @@ # Cookbook:: openstack-telemetry # Recipe:: agent-compute # -# Copyright:: 2013, AT&T Services, Inc. -# Copyright:: 2013, SUSE Linux GmbH -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2013-2021, AT&T Services, Inc. +# Copyright:: 2013-2021, SUSE Linux GmbH +# Copyright:: 2019-2021, Oregon State University # # 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/agent-notification.rb b/recipes/agent-notification.rb index 201b677..773f581 100644 --- a/recipes/agent-notification.rb +++ b/recipes/agent-notification.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-telemetry # Recipe:: agent-notification # -# Copyright:: 2014, IBM Corp. -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2014-2021, IBM Corp. +# Copyright:: 2019-2021, Oregon State University # # 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/aodh.rb b/recipes/aodh.rb index 10d7738..e56706c 100644 --- a/recipes/aodh.rb +++ b/recipes/aodh.rb @@ -2,7 +2,7 @@ # Cookbook:: openstack-telemetry # Recipe:: aodh # -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2019-2021, Oregon State University # # 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/common.rb b/recipes/common.rb index 216d25f..a3ec1f7 100644 --- a/recipes/common.rb +++ b/recipes/common.rb @@ -2,10 +2,10 @@ # Cookbook:: openstack-telemetry # Recipe:: common # -# Copyright:: 2013, AT&T Services, Inc. -# Copyright:: 2013, Craig Tracey -# Copyright:: 2013-2014, SUSE Linux GmbH -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2013-2021, AT&T Services, Inc. +# Copyright:: 2013-2021, Craig Tracey +# Copyright:: 2013-2021, SUSE Linux GmbH +# Copyright:: 2019-2021, Oregon State University # # 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/gnocchi_configure.rb b/recipes/gnocchi_configure.rb index 055a07b..d4262a2 100644 --- a/recipes/gnocchi_configure.rb +++ b/recipes/gnocchi_configure.rb @@ -2,7 +2,7 @@ # Cookbook:: openstack-telemetry # Recipe:: gnocchi_configure # -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2019-2021, Oregon State University # # 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/gnocchi_install.rb b/recipes/gnocchi_install.rb index 7cad2ee..151eab4 100644 --- a/recipes/gnocchi_install.rb +++ b/recipes/gnocchi_install.rb @@ -2,7 +2,7 @@ # Cookbook:: openstack-telemetry # Recipe:: gnocchi_install # -# Copyright:: 2020, Oregon State University +# Copyright:: 2020-2021, Oregon State University # # 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/identity_registration.rb b/recipes/identity_registration.rb index b0a690d..fe23721 100644 --- a/recipes/identity_registration.rb +++ b/recipes/identity_registration.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-telemetry # Recipe:: identity_registration # -# Copyright:: 2013, AT&T Services, Inc. -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2013-2021, AT&T Services, Inc. +# Copyright:: 2019-2021, Oregon State University # # 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/setup.rb b/recipes/setup.rb index 559d8cb..dba9cb0 100644 --- a/recipes/setup.rb +++ b/recipes/setup.rb @@ -2,7 +2,7 @@ # Cookbook:: openstack-telemetry # Recipe:: common # -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2019-2021, Oregon State University # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.