Chef 17 support

- Remove bind from Berksfile
- Update copyright years
- Require Chef >= 16.0

Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-identity/+/814051
Change-Id: I36f04f496425cd3d7a8a3f0f135e0d1bdcaf2ae5
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2021-10-14 12:40:56 -07:00
parent 222df62ab3
commit f687f40c16
19 changed files with 37 additions and 37 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
# 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

View File

@ -25,8 +25,8 @@ handle L2 and L3 networking for various hardware vendors and standards.
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
@ -225,7 +225,7 @@ License and Author
+-----------------+--------------------------------------------------+
| **Copyright** | Copyright (c) 2016, cloudbau GmbH |
+-----------------+--------------------------------------------------+
| **Copyright** | Copyright (c) 2016-2020, Oregon State University |
| **Copyright** | Copyright (c) 2016-2021, Oregon State University |
+-----------------+--------------------------------------------------+
Licensed under the Apache License, Version 2.0 (the "License"); you may

View File

@ -2,9 +2,9 @@
# Cookbook:: openstack-network
# Attributes:: default
#
# Copyright:: 2013, AT&T
# Copyright:: 2014, IBM Corp.
# Copyright:: 2016-2020, Oregon State University
# Copyright:: 2013-2021, AT&T
# Copyright:: 2014-2021, IBM Corp.
# 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.

View File

@ -15,4 +15,4 @@ depends 'openstack-identity', '>= 20.0.0'
issues_url 'https://launchpad.net/openstack-chef'
source_url 'https://opendev.org/openstack/cookbook-openstack-network'
chef_version '>= 15.0'
chef_version '>= 16.0'

View File

@ -2,7 +2,7 @@
# Cookbook:: openstack-network
# Recipe:: _bridge_config_example
#
# 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.

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-network
# Recipe:: db_migration
#
# 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.

View File

@ -2,10 +2,10 @@
# Cookbook:: openstack-network
# Recipe:: default
#
# Copyright:: 2013, AT&T
# Copyright:: 2013-2014, SUSE Linux GmbH
# Copyright:: 2013-2014, IBM Corp.
# Copyright:: 2020, Oregon State University
# Copyright:: 2013-2021, AT&T
# Copyright:: 2013-2021, SUSE Linux GmbH
# Copyright:: 2013-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.

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-network
# Recipe:: dhcp_agent
#
# Copyright:: 2013, AT&T
# Copyright:: 2020, Oregon State University
# Copyright:: 2013-2021, AT&T
# 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.

View File

@ -2,9 +2,9 @@
# Cookbook:: openstack-network
# Recipe:: identity_registration
#
# Copyright:: 2013, AT&T
# Copyright:: 2013, SUSE Linux GmbH
# Copyright:: 2019-2020, Oregon State University
# Copyright:: 2013-2021, AT&T
# Copyright:: 2013-2021, SUSE Linux 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.

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-network
# Recipe:: l3_agent
#
# Copyright:: 2013, AT&T
# Copyright:: 2020, Oregon State University
# Copyright:: 2013-2021, AT&T
# 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.

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-network
# Recipe:: metadata_agent
#
# Copyright:: 2013, AT&T
# Copyright:: 2020, Oregon State University
# Copyright:: 2013-2021, AT&T
# 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.

View File

@ -2,7 +2,7 @@
# Cookbook:: openstack-network
# Recipe:: metering_agent
#
# 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.

View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-network
# Recipe:: ml2_linuxbridge
#
# Copyright:: 2013, AT&T
# Copyright:: 2016-2020, Oregon State University
# Copyright:: 2013-2021, AT&T
# 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.

View File

@ -2,7 +2,7 @@
# Cookbook:: openstack-network
# Recipe:: ml2_opensvswitch
#
# Copyright:: 2013, AT&T
# Copyright:: 2013-2021, AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.

View File

@ -2,7 +2,7 @@
# Cookbook:: openstack-network
# Recipe:: opensvswitch
#
# 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.

View File

@ -2,7 +2,7 @@
# Cookbook:: openstack-network
# Recipe:: openvswitch_agent
#
# 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.

View File

@ -2,7 +2,7 @@
# Cookbook:: openstack-network
# Recipe:: plugin_config
#
# 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.

View File

@ -2,9 +2,9 @@
# Cookbook:: openstack-network
# Recipe:: server
#
# Copyright:: 2013, AT&T
# Copyright:: 2013, SUSE Linux GmbH
# Copyright:: 2020, Oregon State University
# Copyright:: 2013-2021, AT&T
# Copyright:: 2013-2021, SUSE Linux 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.