From 580719e17b74ad7d59eaecf5d563ff7a3502554c Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Thu, 14 Oct 2021 17:04:14 -0700 Subject: [PATCH] Chef 17 updates - Update copyright years - Require Chef >= 16.0 - Remove bind from Berksfile Change-Id: I315658caeb621419c859be5054f739dbed3f3593 Signed-off-by: Lance Albertson --- .rubocop.yml | 4 ++++ Berksfile | 4 ---- README.rst | 6 +++--- attributes/default.rb | 4 ++-- metadata.rb | 2 +- recipes/api.rb | 4 ++-- recipes/conductor.rb | 4 ++-- recipes/identity_registration.rb | 4 ++-- recipes/ironic-common.rb | 4 ++-- spec/api_spec.rb | 2 +- spec/conductor_spec.rb | 2 +- spec/ironic-common_spec.rb | 2 +- 12 files changed, 21 insertions(+), 21 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 154ad0f..ad49509 100644 --- a/Berksfile +++ b/Berksfile @@ -20,8 +20,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 4311628..391d951 100644 --- a/README.rst +++ b/README.rst @@ -20,8 +20,8 @@ https://docs.openstack.org/ironic/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 @@ -103,7 +103,7 @@ License and Author +-----------------+---------------------------------------------------+ | **Copyright** | Copyright (c) 2019, x-ion 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 54d9c20..1560416 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-bare-metal # Attributes:: default # -# Copyright:: 2015, IBM, Corp -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2015-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/metadata.rb b/metadata.rb index 93b6e39..86496b4 100644 --- a/metadata.rb +++ b/metadata.rb @@ -6,7 +6,7 @@ description 'Installs/Configures OpenStack Bare Metal service Ironic' version '20.0.0' issues_url 'https://launchpad.net/openstack-chef' source_url 'https://opendev.org/openstack/cookbook-openstack-bare-metal' -chef_version '>= 15.0' +chef_version '>= 16.0' %w(ubuntu redhat centos).each do |os| supports os diff --git a/recipes/api.rb b/recipes/api.rb index f77b270..8a4d8c0 100644 --- a/recipes/api.rb +++ b/recipes/api.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-bare-metal # Recipe:: api # -# Copyright:: 2015, IBM Corp. -# Copyright:: 2020, Oregon State University +# Copyright:: 2015-2021, IBM Corp. +# 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/conductor.rb b/recipes/conductor.rb index 3f34612..c618adb 100644 --- a/recipes/conductor.rb +++ b/recipes/conductor.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-bare-metal # Recipe:: conductor # -# Copyright:: 2015, IBM Corp. -# Copyright:: 2020, Oregon State University +# Copyright:: 2015-2021, IBM Corp. +# 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 23fb079..811486e 100644 --- a/recipes/identity_registration.rb +++ b/recipes/identity_registration.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-bare-metal # Recipe:: identity_registration # -# Copyright:: 2015, IBM, Inc. -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2015-2021, IBM, 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/ironic-common.rb b/recipes/ironic-common.rb index 76f0b78..4eecdc1 100644 --- a/recipes/ironic-common.rb +++ b/recipes/ironic-common.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-bare-metal # Recipe:: ironic-common # -# Copyright:: 2015, IBM Corp. -# Copyright:: 2020, Oregon State University +# Copyright:: 2015-2021, IBM Corp. +# 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/spec/api_spec.rb b/spec/api_spec.rb index e7a4caf..bddd6df 100644 --- a/spec/api_spec.rb +++ b/spec/api_spec.rb @@ -2,7 +2,7 @@ # Cookbook:: openstack-bare-metal # Spec:: api_spec # -# Copyright:: 2015, IBM Corp. +# Copyright:: 2015-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/spec/conductor_spec.rb b/spec/conductor_spec.rb index be5ec4d..09d6d3b 100644 --- a/spec/conductor_spec.rb +++ b/spec/conductor_spec.rb @@ -2,7 +2,7 @@ # Cookbook:: openstack-bare-metal # Spec:: conductor_spec # -# Copyright:: 2015, IBM Corp. +# Copyright:: 2015-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/spec/ironic-common_spec.rb b/spec/ironic-common_spec.rb index 9df471b..e1347cb 100644 --- a/spec/ironic-common_spec.rb +++ b/spec/ironic-common_spec.rb @@ -2,7 +2,7 @@ # Cookbook:: openstack-bare-metal # Spec:: ironic_common_spec # -# Copyright:: 2015, IBM Corp. +# Copyright:: 2015-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.