From f1f112aff340abd045d09360462a690ec9fd01ce Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Fri, 29 May 2020 21:37:51 -0700 Subject: [PATCH] Updates for Train Changed: -Update release to train Removed: - Unused rubocop rules Change-Id: Ibd5949820b50e05c07b39d893547416e0096193c Depends-On: https://review.opendev.org/731849 Depends-On: https://review.opendev.org/731861 --- .rubocop.yml | 16 ---------------- .rubocop_todo.yml | 19 ------------------- README.rst | 8 ++++---- metadata.rb | 8 ++++---- 4 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 .rubocop.yml delete mode 100644 .rubocop_todo.yml diff --git a/.rubocop.yml b/.rubocop.yml deleted file mode 100644 index 5ffd74f..0000000 --- a/.rubocop.yml +++ /dev/null @@ -1,16 +0,0 @@ -inherit_from: .rubocop_todo.yml - -AllCops: - Include: - - metadata.rb - - Gemfile - - attributes/** - - libraries/** - - providers/** - - recipes/** - - resources/** - - spec/** - Exclude: - - .cookbooks/**/* - - berks-cookbooks/**/* - - .bundle/**/* diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml deleted file mode 100644 index fc2d7ed..0000000 --- a/.rubocop_todo.yml +++ /dev/null @@ -1,19 +0,0 @@ -# This configuration was generated by -# `rubocop --auto-gen-config` -# on 2018-08-03 05:25:56 -0700 using RuboCop version 0.55.0. -# The point is for the user to remove these configuration records -# one by one as the offenses are removed from the code base. -# Note that changes in the inspected code, or installation of new -# versions of RuboCop, may require this file to be generated again. - -# Offense count: 1 -# Cop supports --auto-correct. -Style/IfUnlessModifier: - Exclude: - - 'recipes/common.rb' - -# Offense count: 24 -# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. -# URISchemes: http, https -Metrics/LineLength: - Max: 133 diff --git a/README.rst b/README.rst index 464f42a..3b9a40f 100644 --- a/README.rst +++ b/README.rst @@ -21,7 +21,7 @@ Requirements ============ - Chef 15 or higher -- Chef Workstation 0.15.18 for testing (also includes Berkshelf for +- Chef Workstation 0.18.3 for testing (also includes Berkshelf for cookbook dependency resolution) Platform @@ -37,9 +37,9 @@ Cookbooks The following cookbooks are dependencies: - 'openstackclient' -- 'openstack-common', '>= 19.0.0' -- 'openstack-identity', '>= 19.0.0' -- 'openstack-network', '>= 19.0.0' +- 'openstack-common', '>= 20.0.0' +- 'openstack-identity', '>= 20.0.0' +- 'openstack-network', '>= 20.0.0' Attributes ========== diff --git a/metadata.rb b/metadata.rb index 7965401..675da72 100644 --- a/metadata.rb +++ b/metadata.rb @@ -7,13 +7,13 @@ source_url 'https://opendev.org/openstack/cookbook-openstack-dns' license 'Apache-2.0' description 'Installs and configures the Designate Service' chef_version '>= 15.0' -version '19.0.0' +version '20.0.0' %w(ubuntu redhat centos).each do |os| supports os end depends 'openstackclient' -depends 'openstack-common', '>= 19.0.0' -depends 'openstack-identity', '>= 19.0.0' -depends 'openstack-network', '>= 19.0.0' +depends 'openstack-common', '>= 20.0.0' +depends 'openstack-identity', '>= 20.0.0' +depends 'openstack-network', '>= 20.0.0'