Updates for Train

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

Fixed:
- ChefSpec

Removed:
- Unused rubocop rules

Change-Id: Iea9ced8eee44bf351b803b5171196c511ab572f5
Depends-On: https://review.opendev.org/731859

.rubocop.yml

@@ -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/**/*

.rubocop_todo.yml

@@ -1,21 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2018-08-03 05:26:12 -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:
-    - 'attributes/gnocchi_conf.rb'
-    - 'recipes/aodh.rb'
-    - 'recipes/common.rb'
-
-# Offense count: 80
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 163

README.rst

@@ -23,7 +23,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
@@ -38,9 +38,10 @@ Cookbooks
 
 The following cookbooks are dependencies:
 
+- 'apache2', '~> 8.1'
 - 'openstackclient'
-- 'openstack-common', '>= 19.0.0'
-- 'openstack-identity', '>= 19.0.0'
+- 'openstack-common', '>= 20.0.0'
+- 'openstack-identity', '>= 20.0.0'
 
 Attributes
 ==========

metadata.rb

@@ -3,16 +3,16 @@ maintainer       'openstack-chef'
 maintainer_email 'openstack-discuss@lists.openstack.org'
 license          'Apache-2.0'
 description      'The OpenStack Metering service Ceilometer.'
-version          '19.0.0'
+version          '20.0.0'
 
 %w(ubuntu redhat centos).each do |os|
   supports os
 end
 
-depends 'apache2', '~> 8.0'
+depends 'apache2', '~> 8.1'
 depends 'openstackclient'
-depends 'openstack-common', '>= 19.0.0'
-depends 'openstack-identity', '>= 19.0.0'
+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-telemetry'

spec/aodh_spec.rb

@@ -13,7 +13,7 @@ describe 'openstack-telemetry::aodh' do
     end
 
     it do
-      expect(chef_run).to install_apache2_install('openstack').with(listen: '127.0.0.1:8042')
+      expect(chef_run).to install_apache2_install('openstack').with(listen: %w(127.0.0.1:8042))
     end
 
     it do

spec/gnocchi_configure_spec.rb

@@ -9,7 +9,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
     include_context 'telemetry-stubs'
 
     it do
-      expect(chef_run).to install_apache2_install('openstack').with(listen: '127.0.0.1:8041')
+      expect(chef_run).to install_apache2_install('openstack').with(listen: %w(127.0.0.1:8041))
     end
 
     it do