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 <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2021-10-14 12:48:10 -07:00
parent 1d11e29ce1
commit 0731b49f19
16 changed files with 31 additions and 31 deletions

4
.rubocop.yml Normal file
View File

@ -0,0 +1,4 @@
Chef/Modernize/FoodcriticComments:
Enabled: true
Chef/Style/CopyrightCommentFormat:
Enabled: true

View File

@ -19,8 +19,4 @@ solver :ruby, :required
end end
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 metadata

View File

@ -20,8 +20,8 @@ https://docs.openstack.org/designate/latest/
Requirements Requirements
============ ============
- Chef 15 or higher - Chef 16 or higher
- Chef Workstation 21.2.303 for testing (also includes Berkshelf for - Chef Workstation 21.10.640 for testing (also includes Berkshelf for
cookbook dependency resolution) cookbook dependency resolution)
Platform Platform
@ -121,7 +121,7 @@ License and Author
+-----------------+--------------------------------------------------+ +-----------------+--------------------------------------------------+
| **Copyright** | Copyright (c) 2017, cloudbau GmbH. | | **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 Licensed under the Apache License, Version 2.0 (the "License"); you may

View File

@ -2,9 +2,9 @@
# Cookbook:: openstack-dns # Cookbook:: openstack-dns
# Attributes:: default # Attributes:: default
# #
# Copyright:: 2017, x-ion GmbH # Copyright:: 2017-2021, x-ion GmbH
# Copyright:: 2017, cloudbau GmbH # Copyright:: 2017-2021, cloudbau GmbH
# Copyright:: 2019-2020, Oregon State University # Copyright:: 2019-2021, Oregon State University
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

View File

@ -2,7 +2,7 @@
# Cookbook:: openstack-dns # Cookbook:: openstack-dns
# Attributes:: default # Attributes:: default
# #
# Copyright:: 2017, x-ion GmbH # Copyright:: 2017-2021, x-ion GmbH
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at

View File

@ -5,7 +5,7 @@ issues_url 'https://launchpad.net/openstack-chef'
source_url 'https://opendev.org/openstack/cookbook-openstack-dns' source_url 'https://opendev.org/openstack/cookbook-openstack-dns'
license 'Apache-2.0' license 'Apache-2.0'
description 'Installs and configures the Designate Service' description 'Installs and configures the Designate Service'
chef_version '>= 15.0' chef_version '>= 16.0'
version '20.0.0' version '20.0.0'
%w(ubuntu redhat centos).each do |os| %w(ubuntu redhat centos).each do |os|

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-dns # Cookbook:: openstack-dns
# Recipe:: api # Recipe:: api
# #
# Copyright:: 2017, x-ion GmbH # Copyright:: 2017-2021, x-ion GmbH
# Copyright:: 2019-2020, Oregon State University # Copyright:: 2019-2021, Oregon State University
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-dns # Cookbook:: openstack-dns
# Recipe:: central # Recipe:: central
# #
# Copyright:: 2017, x-ion GmbH # Copyright:: 2017-2021, x-ion GmbH
# Copyright:: 2019-2020, Oregon State University # Copyright:: 2019-2021, Oregon State University
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-dns # Cookbook:: openstack-dns
# Recipe:: common # Recipe:: common
# #
# Copyright:: 2017, x-ion Gmbh # Copyright:: 2017-2021, x-ion Gmbh
# Copyright:: 2019-2020, Oregon State University # Copyright:: 2019-2021, Oregon State University
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-dns # Cookbook:: openstack-dns
# Recipe:: dashboard # Recipe:: dashboard
# #
# Copyright:: 2017, x-ion Gmbh # Copyright:: 2017-2021, x-ion Gmbh
# Copyright:: 2020, Oregon State University # Copyright:: 2020-2021, Oregon State University
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-dns # Cookbook:: openstack-dns
# Recipe:: identity_registration # Recipe:: identity_registration
# #
# Copyright:: 2017, x-ion GmbH # Copyright:: 2017-2021, x-ion GmbH
# Copyright:: 2019-2020, Oregon State University # Copyright:: 2019-2021, Oregon State University
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-dns # Cookbook:: openstack-dns
# Recipe:: mdns # Recipe:: mdns
# #
# Copyright:: 2017, x-ion GmbH # Copyright:: 2017-2021, x-ion GmbH
# Copyright:: 2020, Oregon State University # Copyright:: 2020-2021, Oregon State University
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-dns # Cookbook:: openstack-dns
# Recipe:: neutron_int # Recipe:: neutron_int
# #
# Copyright:: 2017, x-ion GmbH # Copyright:: 2017-2021, x-ion GmbH
# Copyright:: 2020, Oregon State University # Copyright:: 2020-2021, Oregon State University
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-dns # Cookbook:: openstack-dns
# Recipe:: producer # Recipe:: producer
# #
# Copyright:: 2017, x-ion GmbH # Copyright:: 2017-2021, x-ion GmbH
# Copyright:: 2020, Oregon State University # Copyright:: 2020-2021, Oregon State University
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

View File

@ -2,7 +2,7 @@
# Cookbook:: openstack-dns # Cookbook:: openstack-dns
# Recipe:: producer # Recipe:: producer
# #
# Copyright:: 2020, Oregon State University # Copyright:: 2020-2021, Oregon State University
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-dns # Cookbook:: openstack-dns
# Recipe:: worker # Recipe:: worker
# #
# Copyright:: 2017, x-ion GmbH # Copyright:: 2017-2021, x-ion GmbH
# Copyright:: 2020, Oregon State University # Copyright:: 2020-2021, Oregon State University
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.