openstack/cookbook-openstack-common
Code Issues Proposed changes

Chef 17 support

Browse Source 
- Require Chef >= 16.0
- Enable unified_mode
- Update to latest upstream cookbooks for etcd, mariadb and memcached
- Update copyright years

Depends-On: https://review.opendev.org/c/openstack/openstack-chef/+/813950
Change-Id: Ib410ed28388725751a6295c58ce1f5e89c529b28
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2021-10-13 23:28:32 -07:00
parent f686660393
commit d50c4ad40d
22 changed files with 46 additions and 55 deletions

5
.rubocop.yml

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

17
.rubocop_todo.yml

@ -1,6 +1,6 @@
# This configuration was generated by # This configuration was generated by
# `rubocop --auto-gen-config` # `rubocop --auto-gen-config`
# on 2020-05-29 17:26:38 -0700 using RuboCop version 0.82.0. # on 2021-10-14 06:25:41 UTC using RuboCop version 1.22.0.
# The point is for the user to remove these configuration records # The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base. # one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new # Note that changes in the inspected code, or installation of new
@ -18,18 +18,3 @@ Chef/Modernize/DefinesChefSpecMatchers:
Lint/NestedMethodDefinition: Lint/NestedMethodDefinition:
Exclude: Exclude:
- 'libraries/matchers.rb' - 'libraries/matchers.rb'
# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
# SupportedStyles: predicate, comparison
Style/NumericPredicate:
Exclude:
- 'spec/**/*'
- 'libraries/provider_database_mysql_user.rb'
# Offense count: 2
# Cop supports --auto-correct.
Style/ZeroLengthPredicate:
Exclude:
- 'libraries/provider_database_mysql_user.rb'

12
README.rst

@ -23,8 +23,8 @@ https://docs.openstack.org/latest/install/
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
@ -39,9 +39,9 @@ Cookbooks
The following cookbooks are dependencies: The following cookbooks are dependencies:
- 'etcd', '~> 5.6' - 'etcd', '~> 7.0'
- 'mariadb', '~> 4.0' - 'mariadb', '~> 5.0'
- 'memcached', '~> 6.0' - 'memcached', '~> 7.0'
- 'selinux' - 'selinux'
- 'yum-epel' - 'yum-epel'
@ -317,7 +317,7 @@ License and Author
+-----------------+--------------------------------------------------+ +-----------------+--------------------------------------------------+
| **Copyright** | Copyright (c) 2016-2019, x-ion GmbH | | **Copyright** | Copyright (c) 2016-2019, x-ion 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 Licensed under the Apache License, Version 2.0 (the "License"); you may

6
attributes/database.rb

@ -2,9 +2,9 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# Attributes:: database # Attributes:: database
# #
# Copyright:: 2012-2013, AT&T Services, Inc. # Copyright:: 2012-2021, AT&T Services, Inc.
# Copyright:: 2013-2014, SUSE Linux GmbH # Copyright:: 2013-2021, SUSE Linux 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.

6
attributes/default.rb

@ -2,9 +2,9 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# Attributes:: default # Attributes:: default
# #
# Copyright:: 2012-2013, AT&T Services, Inc. # Copyright:: 2012-2021, AT&T Services, Inc.
# Copyright:: 2013-2014, SUSE Linux GmbH # Copyright:: 2013-2021, SUSE Linux GmbH
# Copyright:: 2016-2020, Oregon State University # Copyright:: 2016-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.

6
attributes/messaging.rb

@ -2,9 +2,9 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# Attributes:: messaging # Attributes:: messaging
# #
# Copyright:: 2012-2013, AT&T Services, Inc. # Copyright:: 2012-2021, AT&T Services, Inc.
# Copyright:: 2013-2014, SUSE Linux GmbH # Copyright:: 2013-2021, SUSE Linux GmbH
# Copyright:: 2013-2014, Rackspace US, Inc. # Copyright:: 2013-2021, Rackspace US, Inc.
# #
# 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.

2
libraries/cli.rb

@ -2,7 +2,7 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# library:: cli # library:: cli
# #
# Copyright:: 2014, IBM Corp. # Copyright:: 2014-2021, IBM Corp.
# #
# 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.

2
libraries/config_helpers.rb

@ -2,7 +2,7 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# library:: config_helpers # library:: config_helpers
# #
# Copyright:: 2016, cloudbau GmbH # Copyright:: 2016-2021, cloudbau 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.

2
libraries/endpoints.rb

@ -2,7 +2,7 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# library:: endpoints # library:: endpoints
# #
# Copyright:: 2012-2013, AT&T Services, Inc. # Copyright:: 2012-2021, AT&T Services, Inc.
# #
# 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.

2
libraries/network.rb

@ -2,7 +2,7 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# library:: network # library:: network
# #
# Copyright:: 2012-2013, AT&T Services, Inc. # Copyright:: 2012-2021, AT&T Services, Inc.
# #
# 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.

2
libraries/parse.rb

@ -2,7 +2,7 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# library:: parse # library:: parse
# #
# Copyright:: 2013, Craig Tracey <craigtracey@gmail.com> # Copyright:: 2013-2021, Craig Tracey <craigtracey@gmail.com>
# #
# 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.

4
libraries/passwords.rb

@ -2,8 +2,8 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# library:: passwords # library:: passwords
# #
# Copyright:: 2012-2013, AT&T Services, Inc. # Copyright:: 2012-2021, AT&T Services, Inc.
# Copyright:: 2014, SUSE Linux, GmbH. # Copyright:: 2014-2021, SUSE Linux, 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.

2
libraries/search.rb

@ -2,7 +2,7 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# library:: search # library:: search
# #
# Copyright:: 2013, AT&T Services, Inc. # Copyright:: 2013-2021, AT&T Services, Inc.
# #
# 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.

2
libraries/uri.rb

@ -2,7 +2,7 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# library:: uri # library:: uri
# #
# Copyright:: 2012-2013, AT&T Services, Inc. # Copyright:: 2012-2021, AT&T Services, Inc.
# #
# 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.

8
metadata.rb

@ -9,12 +9,12 @@ version '20.0.0'
supports os supports os
end end
depends 'etcd', '~> 6.0' depends 'etcd', '~> 7.0'
depends 'mariadb', '~> 4.0' depends 'mariadb', '~> 5.0'
depends 'memcached', '~> 6.0' depends 'memcached', '~> 7.0'
depends 'selinux' depends 'selinux'
depends 'yum-epel' depends 'yum-epel'
issues_url 'https://launchpad.net/openstack-chef' issues_url 'https://launchpad.net/openstack-chef'
source_url 'https://opendev.org/openstack/cookbook-openstack-common' source_url 'https://opendev.org/openstack/cookbook-openstack-common'
chef_version '>= 15.0' chef_version '>= 16.0'

4
recipes/client.rb

@ -2,8 +2,8 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# Recipe:: client # Recipe:: client
# #
# Copyright:: 2014, IBM Corp. # Copyright:: 2014-2021, IBM Corp.
# Copyright:: 2017, cloudbau GmbH # Copyright:: 2017-2021, cloudbau 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.

4
recipes/completions.rb

@ -2,8 +2,8 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# Recipe:: completions # Recipe:: completions
# #
# Copyright:: 2019, x-ion GmbH # Copyright:: 2019-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.

2
recipes/default.rb

@ -2,7 +2,7 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# library:: default # library:: default
# #
# Copyright:: 2012-2013, AT&T Services, Inc. # Copyright:: 2012-2021, AT&T Services, Inc.
# #
# 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.

4
recipes/etcd.rb

@ -2,8 +2,8 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# library:: etcd # library:: etcd
# #
# Copyright:: 2017, Workday Inc. # Copyright:: 2017-2021, Workday Inc.
# 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.

2
recipes/logging.rb

@ -2,7 +2,7 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# library:: logging # library:: logging
# #
# Copyright:: 2012-2013, AT&T Services, Inc. # Copyright:: 2012-2021, AT&T Services, Inc.
# #
# 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.

4
recipes/sysctl.rb

@ -2,8 +2,8 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# recipe:: sysctl # recipe:: sysctl
# #
# Copyright:: 2013, Opscode, Inc. # Copyright:: 2013-2021, Chef Software, Inc.
# 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.

3
resources/database.rb

@ -3,7 +3,7 @@
# Cookbook:: openstack-common # Cookbook:: openstack-common
# Resource:: openstack_database # Resource:: openstack_database
# #
# 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.
@ -23,6 +23,7 @@
resource_name :openstack_database resource_name :openstack_database
provides :openstack_database provides :openstack_database
unified_mode true
default_action :create default_action :create
property :service, String, name_property: true property :service, String, name_property: true