Update to Chef Workstation 21.2.303

- Cookstyle fixes

Depends-On: https://review.opendev.org/c/openstack/openstack-chef/+/779389
Change-Id: I36d145087e9240764299358d6fd3fe11fd779544
Signed-off-by: Lance Albertson <lance@osuosl.org>

README.rst

@@ -21,7 +21,7 @@ Requirements
 ============
 
 - Chef 15 or higher
-- Chef Workstation 20.8.111 for testing (also includes Berkshelf for
+- Chef Workstation 21.2.303 for testing (also includes Berkshelf for
   cookbook dependency resolution)
 
 Platform

attributes/default.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-bare-metal
 # Attributes:: default

recipes/api.rb

@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook:: openstack-bare-metal
 # Recipe:: api

recipes/conductor.rb

@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook:: openstack-bare-metal
 # Recipe:: conductor

recipes/identity_registration.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-bare-metal
 # Recipe:: identity_registration

recipes/ironic-common.rb

@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook:: openstack-bare-metal
 # Recipe:: ironic-common

spec/api-rhel_spec.rb

@@ -1,5 +1,3 @@
-# Encoding: utf-8
-
 require_relative 'spec_helper'
 
 describe 'openstack-bare-metal::api' do

spec/api_spec.rb

@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook:: openstack-bare-metal
 # Spec:: api_spec
@@ -64,7 +63,7 @@ describe 'openstack-bare-metal::api' do
           daemon_process: 'ironic-wsgi',
           group: 'ironic',
           log_dir: '/var/log/apache2',
-          run_dir: '/var/lock/apache2',
+          run_dir: '/var/lock',
           server_entry: '/usr/bin/ironic-api-wsgi',
           server_host: '127.0.0.1',
           server_port: '6385',
@@ -80,7 +79,7 @@ describe 'openstack-bare-metal::api' do
       /WSGIApplicationGroup %{GLOBAL}$/,
       %r{ErrorLog /var/log/apache2/ironic-wsgi_error.log$},
       %r{CustomLog /var/log/apache2/ironic-wsgi_access.log combined$},
-      %r{WSGISocketPrefix /var/lock/apache2$},
+      %r{WSGISocketPrefix /var/lock$},
     ].each do |line|
       it do
         expect(chef_run).to render_file('/etc/apache2/sites-available/ironic-api.conf').with_content(line)

spec/conductor_spec.rb

@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook:: openstack-bare-metal
 # Spec:: conductor_spec

spec/identity_registration_spec.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'
 
 describe 'openstack-bare-metal::identity_registration' do

spec/ironic-common_spec.rb

@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook:: openstack-bare-metal
 # Spec:: ironic_common_spec

spec/spec_helper.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require 'chefspec'
 require 'chefspec/berkshelf'
 require 'chef/application'