From 0731b49f19cba69f89d8b011e31ffde99878121b Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Thu, 14 Oct 2021 12:48:10 -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-network/+/814057 Change-Id: Ic9c9987766b1bd0e2131b91b0dfee18670156da7 Signed-off-by: Lance Albertson --- .rubocop.yml | 4 ++++ Berksfile | 4 ---- README.rst | 6 +++--- attributes/default.rb | 6 +++--- attributes/designate_conf.rb | 2 +- metadata.rb | 2 +- recipes/api.rb | 4 ++-- recipes/central.rb | 4 ++-- recipes/common.rb | 4 ++-- recipes/dashboard.rb | 4 ++-- recipes/identity_registration.rb | 4 ++-- recipes/mdns.rb | 4 ++-- recipes/neutron_int.rb | 4 ++-- recipes/producer.rb | 4 ++-- recipes/sink.rb | 2 +- recipes/worker.rb | 4 ++-- 16 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 007959e..593dcbd 100644 --- a/Berksfile +++ b/Berksfile @@ -19,8 +19,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 5c1f04a..1319feb 100644 --- a/README.rst +++ b/README.rst @@ -20,8 +20,8 @@ https://docs.openstack.org/designate/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 @@ -121,7 +121,7 @@ License and Author +-----------------+--------------------------------------------------+ | **Copyright** | Copyright (c) 2017, cloudbau 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 891f49a..563d5ce 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -2,9 +2,9 @@ # Cookbook:: openstack-dns # Attributes:: default # -# Copyright:: 2017, x-ion GmbH -# Copyright:: 2017, cloudbau GmbH -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2017-2021, x-ion GmbH +# Copyright:: 2017-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/attributes/designate_conf.rb b/attributes/designate_conf.rb index 3a284b8..4308046 100644 --- a/attributes/designate_conf.rb +++ b/attributes/designate_conf.rb @@ -2,7 +2,7 @@ # Cookbook:: openstack-dns # Attributes:: default # -# Copyright:: 2017, x-ion GmbH +# Copyright:: 2017-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. # You may obtain a copy of the License at diff --git a/metadata.rb b/metadata.rb index 794fcc7..3935845 100644 --- a/metadata.rb +++ b/metadata.rb @@ -5,7 +5,7 @@ issues_url 'https://launchpad.net/openstack-chef' source_url 'https://opendev.org/openstack/cookbook-openstack-dns' license 'Apache-2.0' description 'Installs and configures the Designate Service' -chef_version '>= 15.0' +chef_version '>= 16.0' version '20.0.0' %w(ubuntu redhat centos).each do |os| diff --git a/recipes/api.rb b/recipes/api.rb index 47fa630..78dd2e6 100644 --- a/recipes/api.rb +++ b/recipes/api.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-dns # Recipe:: api # -# Copyright:: 2017, x-ion GmbH -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2017-2021, x-ion 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/central.rb b/recipes/central.rb index 6aeada6..351979c 100644 --- a/recipes/central.rb +++ b/recipes/central.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-dns # Recipe:: central # -# Copyright:: 2017, x-ion GmbH -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2017-2021, x-ion 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/common.rb b/recipes/common.rb index 75aba18..6ba2613 100644 --- a/recipes/common.rb +++ b/recipes/common.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-dns # Recipe:: common # -# Copyright:: 2017, x-ion Gmbh -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2017-2021, x-ion 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/dashboard.rb b/recipes/dashboard.rb index 15ac5d8..93b380b 100644 --- a/recipes/dashboard.rb +++ b/recipes/dashboard.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-dns # Recipe:: dashboard # -# Copyright:: 2017, x-ion Gmbh -# Copyright:: 2020, Oregon State University +# Copyright:: 2017-2021, x-ion Gmbh +# 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 b16dac3..9dd4852 100644 --- a/recipes/identity_registration.rb +++ b/recipes/identity_registration.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-dns # Recipe:: identity_registration # -# Copyright:: 2017, x-ion GmbH -# Copyright:: 2019-2020, Oregon State University +# Copyright:: 2017-2021, x-ion 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/mdns.rb b/recipes/mdns.rb index d53e4e9..d7810e7 100644 --- a/recipes/mdns.rb +++ b/recipes/mdns.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-dns # Recipe:: mdns # -# Copyright:: 2017, x-ion GmbH -# Copyright:: 2020, Oregon State University +# Copyright:: 2017-2021, x-ion GmbH +# 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/neutron_int.rb b/recipes/neutron_int.rb index a9cfcad..3acb471 100644 --- a/recipes/neutron_int.rb +++ b/recipes/neutron_int.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-dns # Recipe:: neutron_int # -# Copyright:: 2017, x-ion GmbH -# Copyright:: 2020, Oregon State University +# Copyright:: 2017-2021, x-ion GmbH +# 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/producer.rb b/recipes/producer.rb index d5d661e..0a4d6bb 100644 --- a/recipes/producer.rb +++ b/recipes/producer.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-dns # Recipe:: producer # -# Copyright:: 2017, x-ion GmbH -# Copyright:: 2020, Oregon State University +# Copyright:: 2017-2021, x-ion GmbH +# 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/sink.rb b/recipes/sink.rb index 70afc75..0279462 100644 --- a/recipes/sink.rb +++ b/recipes/sink.rb @@ -2,7 +2,7 @@ # Cookbook:: openstack-dns # Recipe:: producer # -# 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/worker.rb b/recipes/worker.rb index 74f6bc8..6c1415c 100644 --- a/recipes/worker.rb +++ b/recipes/worker.rb @@ -2,8 +2,8 @@ # Cookbook:: openstack-dns # Recipe:: worker # -# Copyright:: 2017, x-ion GmbH -# Copyright:: 2020, Oregon State University +# Copyright:: 2017-2021, x-ion GmbH +# 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.