Chef 17 support

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

Depends-On: https://review.opendev.org/c/openstack/cookbook-openstackclient/+/813953
Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-ops-database/+/814032
Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-ops-messaging/+/814035
Change-Id: I5d4f38f56e5a411b83b02d2fd9fff2e013947d71
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2021-10-14 11:57:40 -07:00
parent f70a3454c5
commit e76dcb39e1
11 changed files with 24 additions and 24 deletions

4
.rubocop.yml Normal file
View File

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

View File

@ -20,7 +20,3 @@ metadata
cookbook "openstack#{cookbook}", git: "https://opendev.org/openstack/cookbook-openstack#{cookbook}", group: group
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'

View File

@ -21,8 +21,8 @@ https://docs.openstack.org/keystone/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
@ -151,7 +151,7 @@ License and Author
+---------------+----------------------------------------------+
| **Copyright** | GmbH Copyright 2013-2014, IBM, Corp. |
+---------------+----------------------------------------------+
| **Copyright** | Copyright 2016-2020, Oregon State University |
| **Copyright** | Copyright 2016-2021, Oregon State University |
+---------------+----------------------------------------------+
Licensed under the Apache License, Version 2.0 (the "License"); you may

View File

@ -2,13 +2,13 @@
# Cookbook:: openstack-identity
# Recipe:: default
#
# Copyright:: 2012-2013, AT&T Services, Inc.
# Copyright:: 2013, Opscode, Inc.
# Copyright:: 2013, IBM Corp.
# Copyright:: 2017, x-ion GmbH
# Copyright:: 2018, Workday, Inc.
# Copyright:: 2019, x-ion GmbH
# Copyright:: 2016-2020, Oregon State University
# Copyright:: 2012-2021, AT&T Services, Inc.
# Copyright:: 2013-2021, Chef Software, Inc.
# Copyright:: 2013-2021, IBM Corp.
# Copyright:: 2017-2021, x-ion GmbH
# Copyright:: 2018-2021, Workday, Inc.
# Copyright:: 2019-2021, x-ion GmbH
# 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-common', '>= 20.0.0'
issues_url 'https://launchpad.net/openstack-chef'
source_url 'https://opendev.org/openstack/cookbook-openstack-identity'
chef_version '>= 15.0'
chef_version '>= 16.0'

View File

@ -2,7 +2,7 @@
# Cookbook:: openstack-identity
# Recipe:: _credential_tokens
#
# 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-identity
# Recipe:: _fernet_tokens
#
# 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-identity
# recipe:: cloud_config
#
# Copyright:: 2019 x-ion GmbH
# Copyright:: 2019-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.

View File

@ -2,7 +2,7 @@
# Cookbook:: openstack-identity
# recipe:: openrc
#
# Copyright:: 2014 IBM Corp.
# Copyright:: 2014-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.

View File

@ -2,9 +2,9 @@
# Cookbook:: openstack-identity
# Recipe:: setup
#
# Copyright:: 2012, Rackspace US, Inc.
# Copyright:: 2012-2013, Opscode, Inc.
# Copyright:: 2020, Oregon State University
# Copyright:: 2012-2021, Rackspace US, Inc.
# Copyright:: 2012-2021, Chef Software, Inc.
# 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-identity
# Recipe:: server-apache
#
# Copyright:: 2015, IBM Corp. Inc.
# Copyright:: 2016-2020, Oregon State University
# Copyright:: 2015-2021, IBM Corp. Inc.
# 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.