openstack
/
cookbook-openstack-image
Code Issues Proposed changes

Chef 17 support 

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

Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-identity/+/814051
Change-Id: I849792383efdcced72e399788ca849c102b8d510
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2021-10-14 12:04:28 -07:00
parent b74e375286
commit d911425d0a
10 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.rubocop.yml
View File

@ -1 +1,4 @@
inherit_from: .rubocop_todo.yml
Chef/Modernize/FoodcriticComments:
Enabled: true
Chef/Style/CopyrightCommentFormat:
Enabled: true

4
Berksfile
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

6
README.rst
View File

@ -20,8 +20,8 @@ https://docs.openstack.org/glance/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
@ -206,7 +206,7 @@ License and Author
+-----------------+----------------------------------------------------------+
| **Copyright** | Copyright (c) 2014, SUSE Linux, 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

6
attributes/default.rb
View File

@ -2,9 +2,9 @@
# Cookbook:: openstack-image
# Attributes:: default
#
# Copyright:: 2012, Rackspace US, Inc.
# Copyright:: 2013, Craig Tracey <craigtracey@gmail.com>
# Copyright:: 2019-2020, Oregon State University
# Copyright:: 2012-2021, Rackspace US, Inc.
# Copyright:: 2013-2021, Craig Tracey <craigtracey@gmail.com>
# 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.

2
metadata.rb
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-image'
chef_version '>= 15.0'
chef_version '>= 16.0'

6
providers/image.rb
View File

@ -2,9 +2,9 @@
# Cookbook:: openstack-image
# Provider:: image
#
# Copyright:: 2012, Rackspace US, Inc.
# Copyright:: 2013, Opscode, Inc.
# Copyright:: 2020, Oregon State University
# Copyright:: 2012-2021, Rackspace US, Inc.
# Copyright:: 2013-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.

12
recipes/api.rb
View File

@ -2,12 +2,12 @@
# Cookbook:: openstack-image
# Recipe:: api
#
# Copyright:: 2012, Rackspace US, Inc.
# Copyright:: 2012-2013, Opscode, Inc.
# Copyright:: 2012-2013, AT&T Services, Inc.
# Copyright:: 2013, Craig Tracey <craigtracey@gmail.com>
# Copyright:: 2013, IBM Corp.
# Copyright:: 2019-2020, Oregon State University
# Copyright:: 2012-2021, Rackspace US, Inc.
# Copyright:: 2012-2021, Chef Software, Inc.
# Copyright:: 2012-2021, AT&T Services, Inc.
# Copyright:: 2013-2021, Craig Tracey <craigtracey@gmail.com>
# Copyright:: 2013-2021, IBM Corp.
# 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.

8
recipes/identity_registration.rb
View File

@ -2,10 +2,10 @@
# Cookbook:: openstack-image
# Recipe:: identity_registration
#
# Copyright:: 2013, AT&T Services, Inc.
# Copyright:: 2013, Craig Tracey <craigtracey@gmail.com>
# Copyright:: 2013, Opscode, Inc.
# Copyright:: 2019-2020, Oregon State University
# Copyright:: 2013-2021, AT&T Services, Inc.
# Copyright:: 2013-2021, Craig Tracey <craigtracey@gmail.com>
# Copyright:: 2013-2021, Chef Software, Inc.
# 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.

2
recipes/image_upload.rb
View File

@ -2,7 +2,7 @@
# Cookbook:: openstack-image
# Recipe:: image_upload
#
# Copyright:: 2013, IBM Corp.
# Copyright:: 2013-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.

5
resources/image.rb
View File

@ -2,8 +2,8 @@
# Cookbook:: openstack-image
# Resource:: image
#
# Copyright:: 2012, Rackspace US, Inc.
# Copyright:: 2020, Oregon State University
# Copyright:: 2012-2021, Rackspace US, 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.
@ -20,6 +20,7 @@
actions :upload
default_action :upload
unified_mode true
BOOLEAN = [TrueClass, FalseClass].freeze