commit 9ed88a8ff48d003931a6c20c49e876ab12160e9c
Author: Lance Albertson <lance@osuosl.org>
Date:   Mon Oct 5 17:13:24 2020 -0700

    Cookstyle 6.19.5 fixes
    
    Update ChefSpec due to changes made in apache2 cookbook.
    
    Depends-On: https://review.opendev.org/756168
    Change-Id: Ie4a830620f217f5879ae4270850214902c202dbf
    Signed-off-by: Lance Albertson <lance@osuosl.org>

diff --git a/attributes/default.rb b/attributes/default.rb
index 821ba0a..b33a010 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-identity
 # Recipe:: default
diff --git a/recipes/_credential_tokens.rb b/recipes/_credential_tokens.rb
index 9faf39f..ecfe7d3 100644
--- a/recipes/_credential_tokens.rb
+++ b/recipes/_credential_tokens.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-identity
 # Recipe:: _credential_tokens
diff --git a/recipes/_fernet_tokens.rb b/recipes/_fernet_tokens.rb
index 9b45bd3..2cbc7fe 100644
--- a/recipes/_fernet_tokens.rb
+++ b/recipes/_fernet_tokens.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-identity
 # Recipe:: _fernet_tokens
diff --git a/recipes/cloud_config.rb b/recipes/cloud_config.rb
index 809583e..42a6011 100644
--- a/recipes/cloud_config.rb
+++ b/recipes/cloud_config.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-identity
 # recipe:: cloud_config
diff --git a/recipes/openrc.rb b/recipes/openrc.rb
index b2bbba0..9236d2a 100644
--- a/recipes/openrc.rb
+++ b/recipes/openrc.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-identity
 # recipe:: openrc
diff --git a/recipes/registration.rb b/recipes/registration.rb
index baf123d..a763568 100644
--- a/recipes/registration.rb
+++ b/recipes/registration.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-identity
 # Recipe:: setup
diff --git a/recipes/server-apache.rb b/recipes/server-apache.rb
index 05533ce..05d0ff5 100644
--- a/recipes/server-apache.rb
+++ b/recipes/server-apache.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-identity
 # Recipe:: server-apache
diff --git a/spec/cloud_config_spec.rb b/spec/cloud_config_spec.rb
index 1041e7a..72535d0 100644
--- a/spec/cloud_config_spec.rb
+++ b/spec/cloud_config_spec.rb
@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'
 require 'yaml'
 
diff --git a/spec/credential_tokens_spec.rb b/spec/credential_tokens_spec.rb
index d64555f..3a94d16 100644
--- a/spec/credential_tokens_spec.rb
+++ b/spec/credential_tokens_spec.rb
@@ -1,5 +1,3 @@
-# encoding: UTF-8
-#
 
 require_relative 'spec_helper'
 
diff --git a/spec/fernet_tokens_spec.rb b/spec/fernet_tokens_spec.rb
index 58b53b1..d6024aa 100644
--- a/spec/fernet_tokens_spec.rb
+++ b/spec/fernet_tokens_spec.rb
@@ -1,5 +1,3 @@
-# encoding: UTF-8
-#
 
 require_relative 'spec_helper'
 
diff --git a/spec/openrc_spec.rb b/spec/openrc_spec.rb
index 544f9c7..c6c36b9 100644
--- a/spec/openrc_spec.rb
+++ b/spec/openrc_spec.rb
@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'
 
 describe 'openstack-identity::openrc' do
diff --git a/spec/registration_spec.rb b/spec/registration_spec.rb
index 16c6f8a..66806d8 100644
--- a/spec/registration_spec.rb
+++ b/spec/registration_spec.rb
@@ -1,5 +1,3 @@
-# encoding: UTF-8
-#
 
 require_relative 'spec_helper'
 
diff --git a/spec/server-apache-redhat_spec.rb b/spec/server-apache-redhat_spec.rb
index ca88063..c02f294 100644
--- a/spec/server-apache-redhat_spec.rb
+++ b/spec/server-apache-redhat_spec.rb
@@ -1,5 +1,3 @@
-# encoding: UTF-8
-#
 
 require_relative 'spec_helper'
 
diff --git a/spec/server-apache_spec.rb b/spec/server-apache_spec.rb
index 61e679c..f8b8a50 100644
--- a/spec/server-apache_spec.rb
+++ b/spec/server-apache_spec.rb
@@ -1,5 +1,3 @@
-# encoding: UTF-8
-#
 
 require_relative 'spec_helper'
 
@@ -351,7 +349,7 @@ describe 'openstack-identity::server-apache' do
             variables: {
               group: 'keystone',
               log_dir: '/var/log/apache2',
-              run_dir: '/var/lock/apache2',
+              run_dir: '/var/lock',
               server_alias: 'identity',
               server_entry: '/usr/bin/keystone-wsgi-public',
               server_host: '127.0.0.1',
@@ -372,7 +370,7 @@ describe 'openstack-identity::server-apache' do
           %r{WSGIScriptAlias / /usr/bin/keystone-wsgi-public$},
           %r{ErrorLog /var/log/apache2/identity.log$},
           %r{CustomLog /var/log/apache2/identity_access.log combined$},
-          %r{WSGISocketPrefix /var/lock/apache2$},
+          %r{WSGISocketPrefix /var/lock$},
         ].each do |line|
           it do
             expect(chef_run).to render_file(file).with_content(line)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 91ccdae..e3ca179 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-# Encoding: UTF-8
 require 'chefspec'
 require 'chefspec/berkshelf'