Updates for Train

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

Fixed:
- Cookstyle
- ChefSpec

Removed:
- Unused .rubocop.yml

Change-Id: I2dc8c767ac4f6bb0635ffa4a64d6e8e47fc29093
Depends-On: https://review.opendev.org/731850
Depends-On: https://review.opendev.org/731851
Depends-On: https://review.opendev.org/731855
Depends-On: https://review.opendev.org/731858

.rubocop.yml

@@ -1,14 +0,0 @@
-AllCops:
-  Include:
-    - metadata.rb
-    - Gemfile
-    - attributes/**
-    - libraries/**
-    - providers/**
-    - recipes/**
-    - resources/**
-    - spec/**
-  Exclude:
-    - .cookbooks/**/*
-    - berks-cookbooks/**/*
-    - .bundle/**/*

Berksfile

@@ -12,7 +12,7 @@ metadata
   %w(-integration-test integration),
   %w(-network integration),
   %w(-ops-database integration),
-  %w(-ops-messaging integration)
+  %w(-ops-messaging integration),
 ].each do |cookbook, group|
   if Dir.exist?("../cookbook-openstack#{cookbook}")
     cookbook "openstack#{cookbook}", path: "../cookbook-openstack#{cookbook}", group: group

README.rst

@@ -22,7 +22,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,8 +37,8 @@ Cookbooks
 
 The following cookbooks are dependencies:
 
-- 'apache2', '~> 8.0'
-- 'openstack-common', '>= 19.0.0'
+- 'apache2', '~> 8.1'
+- 'openstack-common', '>= 20.0.0'
 - 'openstackclient'
 
 Attributes

metadata.rb

@@ -3,15 +3,15 @@ maintainer       'openstack-chef'
 maintainer_email 'openstack-discuss@lists.openstack.org'
 license          'Apache-2.0'
 description      'The OpenStack Identity service Keystone.'
-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-common', '>= 20.0.0'
 
 issues_url 'https://launchpad.net/openstack-chef'
 source_url 'https://opendev.org/openstack/cookbook-openstack-identity'

spec/server-apache_spec.rb

@@ -321,7 +321,7 @@ describe 'openstack-identity::server-apache' do
       end
 
       it do
-        expect(chef_run).to install_apache2_install('openstack').with(listen: '127.0.0.1:5000')
+        expect(chef_run).to install_apache2_install('openstack').with(listen: %w(127.0.0.1:5000))
       end
 
       it do