From e76dcb39e181a9c6432e5a16c5b8cc074a93e9db Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Thu, 14 Oct 2021 11:57:40 -0700 Subject: [PATCH] Chef 17 support - Require Chef >= 16.0 - Remove bind from Berksfile - Update copyright years Depends-On: https://review.opendev.org/c/openstack/cookbook-openstackclient/+/813953 Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-ops-database/+/814032 Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-ops-messaging/+/814035 Change-Id: I5d4f38f56e5a411b83b02d2fd9fff2e013947d71 Signed-off-by: Lance Albertson --- .rubocop.yml | 4 ++++ Berksfile | 4 ---- README.rst | 6 +++--- attributes/default.rb | 14 +++++++------- metadata.rb | 2 +- recipes/_credential_tokens.rb | 2 +- recipes/_fernet_tokens.rb | 2 +- recipes/cloud_config.rb | 2 +- recipes/openrc.rb | 2 +- recipes/registration.rb | 6 +++--- recipes/server-apache.rb | 4 ++-- 11 files changed, 24 insertions(+), 24 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 4cb1002..98e72f9 100644 --- a/Berksfile +++ b/Berksfile @@ -20,7 +20,3 @@ metadata cookbook "openstack#{cookbook}", git: "https://opendev.org/openstack/cookbook-openstack#{cookbook}", group: group 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' diff --git a/README.rst b/README.rst index 2c055e8..c167025 100644 --- a/README.rst +++ b/README.rst @@ -21,8 +21,8 @@ https://docs.openstack.org/keystone/latest/ 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 @@ -151,7 +151,7 @@ License and Author +---------------+----------------------------------------------+ | **Copyright** | GmbH Copyright 2013-2014, IBM, Corp. | +---------------+----------------------------------------------+ -| **Copyright** | Copyright 2016-2020, Oregon State University | +| **Copyright** | Copyright 2016-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 892da48..0ceb936 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -2,13 +2,13 @@ # Cookbook:: openstack-identity # Recipe:: default # -# Copyright:: 2012-2013, AT&T Services, Inc. -# Copyright:: 2013, Opscode, Inc. -# Copyright:: 2013, IBM Corp. -# Copyright:: 2017, x-ion GmbH -# Copyright:: 2018, Workday, Inc. -# Copyright:: 2019, x-ion GmbH -# Copyright:: 2016-2020, Oregon State University +# Copyright:: 2012-2021, AT&T Services, Inc. +# Copyright:: 2013-2021, Chef Software, Inc. +# Copyright:: 2013-2021, IBM Corp. +# Copyright:: 2017-2021, x-ion GmbH +# Copyright:: 2018-2021, Workday, Inc. +# Copyright:: 2019-2021, x-ion GmbH +# Copyright:: 2016-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 0654ddf..7b9cc15 100644 --- a/metadata.rb +++ b/metadata.rb @@ -15,4 +15,4 @@ depends 'openstack-common', '>= 20.0.0' issues_url 'https://launchpad.net/openstack-chef' source_url 'https://opendev.org/openstack/cookbook-openstack-identity' -chef_version '>= 15.0' +chef_version '>= 16.0' diff --git a/recipes/_credential_tokens.rb b/recipes/_credential_tokens.rb index ecfe7d3..8cebbac 100644 --- a/recipes/_credential_tokens.rb +++ b/recipes/_credential_tokens.rb @@ -2,7 +2,7 @@ # Cookbook:: openstack-identity # Recipe:: _credential_tokens # -# 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/_fernet_tokens.rb b/recipes/_fernet_tokens.rb index 2cbc7fe..9215cc4 100644 --- a/recipes/_fernet_tokens.rb +++ b/recipes/_fernet_tokens.rb @@ -2,7 +2,7 @@ # Cookbook:: openstack-identity # Recipe:: _fernet_tokens # -# 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/cloud_config.rb b/recipes/cloud_config.rb index 42a6011..fcfeb86 100644 --- a/recipes/cloud_config.rb +++ b/recipes/cloud_config.rb @@ -2,7 +2,7 @@ # Cookbook:: openstack-identity # recipe:: cloud_config # -# Copyright:: 2019 x-ion GmbH +# Copyright:: 2019-2021, x-ion GmbH # # 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/openrc.rb b/recipes/openrc.rb index 9236d2a..8b33f67 100644 --- a/recipes/openrc.rb +++ b/recipes/openrc.rb @@ -2,7 +2,7 @@ # Cookbook:: openstack-identity # recipe:: openrc # -# Copyright:: 2014 IBM Corp. +# Copyright:: 2014-2021, IBM Corp. # # 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/registration.rb b/recipes/registration.rb index a763568..ab9cc8e 100644 --- a/recipes/registration.rb +++ b/recipes/registration.rb @@ -2,9 +2,9 @@ # Cookbook:: openstack-identity # Recipe:: setup # -# Copyright:: 2012, Rackspace US, Inc. -# Copyright:: 2012-2013, Opscode, Inc. -# Copyright:: 2020, Oregon State University +# Copyright:: 2012-2021, Rackspace US, Inc. +# Copyright:: 2012-2021, Chef Software, Inc. +# 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/server-apache.rb b/recipes/server-apache.rb index d65c19b..a3a511e 100644 --- a/recipes/server-apache.rb +++ b/recipes/server-apache.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-identity # Recipe:: server-apache # -# Copyright:: 2015, IBM Corp. Inc. -# Copyright:: 2016-2020, Oregon State University +# Copyright:: 2015-2021, IBM Corp. Inc. +# Copyright:: 2016-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.