From 2c761a06b638da00e1c38b50afc1b7c8b0bbff06 Mon Sep 17 00:00:00 2001
From: Lance Albertson <lance@osuosl.org>
Date: Fri, 29 May 2020 21:41:50 -0700
Subject: [PATCH] Updates for Train

Changed:
- Update release to train
- Update to apache2 ~> 8.1

Removed:
- Unused rubocop rules

Change-Id: I8aa404752480497b139f6a9eba961c926071f409
Depends-On: https://review.opendev.org/731859
---
 .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 46866d6..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:55 -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: 3
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'recipes/apache2-server.rb'
-
-# Offense count: 260
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 249
diff --git a/README.rst b/README.rst
index 1cde77c..0ab42a2 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
@@ -36,9 +36,9 @@ Cookbooks
 
 The following cookbooks are dependencies:
 
-- 'apache2', '~> 8.0'
-- 'openstack-common', '>= 19.0.0'
-- 'openstack-identity', '>= 19.0.0'
+- 'apache2', '~> 8.1'
+- 'openstack-common', '>= 20.0.0'
+- 'openstack-identity', '>= 20.0.0'
 
 Attributes
 ==========
diff --git a/metadata.rb b/metadata.rb
index d55c296..241ecc3 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -3,15 +3,15 @@ maintainer       'openstack-chef'
 maintainer_email 'openstack-discuss@lists.openstack.org'
 license          'Apache-2.0'
 description      'Installs/Configures the OpenStack Dashboard (Horizon)'
-version          '19.0.0'
+version          '20.0.0'
 
 %w(ubuntu redhat centos).each do |os|
   supports os
 end
 
-depends 'apache2', '~> 8.0'
-depends 'openstack-common', '>= 19.0.0'
-depends 'openstack-identity', '>= 19.0.0'
+depends 'apache2', '~> 8.1'
+depends 'openstack-common', '>= 20.0.0'
+depends 'openstack-identity', '>= 20.0.0'
 
 issues_url 'https://launchpad.net/openstack-chef'
 source_url 'https://opendev.org/openstack/cookbook-openstack-dashboard'