From 9276352d024fa5f57aa2f9d837daa35fadba0a3b Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Wed, 13 Oct 2021 21:35:05 -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-common/+/813952 Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-ops-database/+/814032 Change-Id: If7390377bff2c3c37f861138a92f27d7202c29b5 Signed-off-by: Lance Albertson --- .rubocop.yml | 4 ++++ Berksfile | 4 ---- README.rst | 6 +++--- Rakefile | 2 +- libraries/openstack_base.rb | 4 ++-- libraries/openstack_domain.rb | 2 +- libraries/openstack_endpoint.rb | 2 +- libraries/openstack_project.rb | 2 +- libraries/openstack_role.rb | 2 +- libraries/openstack_service.rb | 2 +- libraries/openstack_user.rb | 2 +- metadata.rb | 2 +- spec/cookbooks/openstackclient_test/metadata.rb | 2 +- spec/cookbooks/openstackclient_test/recipes/domain.rb | 2 +- spec/cookbooks/openstackclient_test/recipes/endpoint.rb | 2 +- spec/cookbooks/openstackclient_test/recipes/project.rb | 2 +- spec/cookbooks/openstackclient_test/recipes/role.rb | 2 +- spec/cookbooks/openstackclient_test/recipes/service.rb | 2 +- spec/cookbooks/openstackclient_test/recipes/user.rb | 2 +- spec/domain_spec.rb | 2 +- spec/endpoint_spec.rb | 2 +- spec/project_spec.rb | 2 +- spec/role_spec.rb | 2 +- spec/service_spec.rb | 2 +- spec/spec_helper.rb | 2 +- spec/user_spec.rb | 2 +- 26 files changed, 31 insertions(+), 31 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 fb41902..552016a 100644 --- a/Berksfile +++ b/Berksfile @@ -37,10 +37,6 @@ 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 # cookbook for testing LWRPs: diff --git a/README.rst b/README.rst index 4dc75de..f06a41c 100644 --- a/README.rst +++ b/README.rst @@ -13,8 +13,8 @@ it. 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) - gem 'fog-openstack' @@ -79,7 +79,7 @@ License and Author +-----------------+---------------------------------------------------+ | **Copyright** | Copyright (c) 2016-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/Rakefile b/Rakefile index df89369..6da12cb 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/libraries/openstack_base.rb b/libraries/openstack_base.rb index 52f6748..50d515e 100644 --- a/libraries/openstack_base.rb +++ b/libraries/openstack_base.rb @@ -1,7 +1,7 @@ # -# Copyright:: 2016 cloudbau GmbH -# Copyright:: 2019 Oregon State University +# Copyright:: 2016-2021, cloudbau 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/libraries/openstack_domain.rb b/libraries/openstack_domain.rb index d5dd751..b0b18de 100644 --- a/libraries/openstack_domain.rb +++ b/libraries/openstack_domain.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/libraries/openstack_endpoint.rb b/libraries/openstack_endpoint.rb index e603746..8f5e439 100644 --- a/libraries/openstack_endpoint.rb +++ b/libraries/openstack_endpoint.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/libraries/openstack_project.rb b/libraries/openstack_project.rb index 48c5207..3b2b81f 100644 --- a/libraries/openstack_project.rb +++ b/libraries/openstack_project.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/libraries/openstack_role.rb b/libraries/openstack_role.rb index 9aa6fc9..7f8d226 100644 --- a/libraries/openstack_role.rb +++ b/libraries/openstack_role.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/libraries/openstack_service.rb b/libraries/openstack_service.rb index f043b79..0e0aa6a 100644 --- a/libraries/openstack_service.rb +++ b/libraries/openstack_service.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/libraries/openstack_user.rb b/libraries/openstack_user.rb index e6323ee..50e6d58 100755 --- a/libraries/openstack_user.rb +++ b/libraries/openstack_user.rb @@ -1,5 +1,5 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/metadata.rb b/metadata.rb index e90cad4..b8bfa55 100644 --- a/metadata.rb +++ b/metadata.rb @@ -5,7 +5,7 @@ license 'Apache-2.0' description 'Installs the fog-openstack gem and offers LWRPs to use it' issues_url 'https://launchpad.net/openstack-chef' source_url 'https://opendev.org/openstack/cookbook-openstack-client' -chef_version '>= 15.0' +chef_version '>= 16.0' version '20.0.0' %w(ubuntu redhat centos).each do |os| diff --git a/spec/cookbooks/openstackclient_test/metadata.rb b/spec/cookbooks/openstackclient_test/metadata.rb index e6d097d..db1e107 100644 --- a/spec/cookbooks/openstackclient_test/metadata.rb +++ b/spec/cookbooks/openstackclient_test/metadata.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/spec/cookbooks/openstackclient_test/recipes/domain.rb b/spec/cookbooks/openstackclient_test/recipes/domain.rb index 2738894..8c94396 100644 --- a/spec/cookbooks/openstackclient_test/recipes/domain.rb +++ b/spec/cookbooks/openstackclient_test/recipes/domain.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/spec/cookbooks/openstackclient_test/recipes/endpoint.rb b/spec/cookbooks/openstackclient_test/recipes/endpoint.rb index 7386a9f..8c7299c 100644 --- a/spec/cookbooks/openstackclient_test/recipes/endpoint.rb +++ b/spec/cookbooks/openstackclient_test/recipes/endpoint.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/spec/cookbooks/openstackclient_test/recipes/project.rb b/spec/cookbooks/openstackclient_test/recipes/project.rb index 46bd9eb..1a87d06 100644 --- a/spec/cookbooks/openstackclient_test/recipes/project.rb +++ b/spec/cookbooks/openstackclient_test/recipes/project.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/spec/cookbooks/openstackclient_test/recipes/role.rb b/spec/cookbooks/openstackclient_test/recipes/role.rb index 48aee32..35b9476 100644 --- a/spec/cookbooks/openstackclient_test/recipes/role.rb +++ b/spec/cookbooks/openstackclient_test/recipes/role.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/spec/cookbooks/openstackclient_test/recipes/service.rb b/spec/cookbooks/openstackclient_test/recipes/service.rb index ccb43fc..f9de722 100644 --- a/spec/cookbooks/openstackclient_test/recipes/service.rb +++ b/spec/cookbooks/openstackclient_test/recipes/service.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/spec/cookbooks/openstackclient_test/recipes/user.rb b/spec/cookbooks/openstackclient_test/recipes/user.rb index 30fd803..6a9b4ab 100644 --- a/spec/cookbooks/openstackclient_test/recipes/user.rb +++ b/spec/cookbooks/openstackclient_test/recipes/user.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/spec/domain_spec.rb b/spec/domain_spec.rb index 02621c0..32a6fec 100644 --- a/spec/domain_spec.rb +++ b/spec/domain_spec.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/spec/endpoint_spec.rb b/spec/endpoint_spec.rb index bfd28f7..3fa18d1 100644 --- a/spec/endpoint_spec.rb +++ b/spec/endpoint_spec.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/spec/project_spec.rb b/spec/project_spec.rb index 1f8475c..e6f7801 100644 --- a/spec/project_spec.rb +++ b/spec/project_spec.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/spec/role_spec.rb b/spec/role_spec.rb index f50ccc9..c41d3db 100644 --- a/spec/role_spec.rb +++ b/spec/role_spec.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/spec/service_spec.rb b/spec/service_spec.rb index 261d2f9..0ddace4 100644 --- a/spec/service_spec.rb +++ b/spec/service_spec.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/spec/spec_helper.rb b/spec/spec_helper.rb index c72d8f6..dcc041d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau 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/spec/user_spec.rb b/spec/user_spec.rb index 4b57eb1..9f26329 100755 --- a/spec/user_spec.rb +++ b/spec/user_spec.rb @@ -1,6 +1,6 @@ # -# Copyright:: 2016 cloudbau GmbH +# Copyright:: 2016-2021, cloudbau GmbH # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.