Cookstyle 6.19.5 fixes

Update ChefSpec due to changes made in apache2 cookbook. Depends-On: https://review.opendev.org/756168 Change-Id: I3ec792c519650b2d95a976ad50419a9b417a3514 Signed-off-by: Lance Albertson <lance@osuosl.org>
2020-10-05 17:26:51 -07:00 · 2020-10-05 17:26:51 -07:00 · af47ea6ef5
parent d645ef3f5e
commit af47ea6ef5
41 changed files with 6 additions and 74 deletions
--- a/attributes/default.rb
+++ b/attributes/default.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-#

 # Set to some text value if you want templated config files
 # to contain a custom banner at the top of the written file
--- a/attributes/placement.rb
+++ b/attributes/placement.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-#

 # Set to some text value if you want templated config files
 # to contain a custom banner at the top of the written file
--- a/recipes/_nova_apache.rb
+++ b/recipes/_nova_apache.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-compute
 # Recipe:: _nova_apache
--- a/recipes/_nova_cell.rb
+++ b/recipes/_nova_cell.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-compute
 # Recipe:: _nova_cell
--- a/recipes/api-metadata.rb
+++ b/recipes/api-metadata.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-compute
 # Recipe:: api-metadata
--- a/recipes/api-os-compute.rb
+++ b/recipes/api-os-compute.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-compute
 # Recipe:: api-os-compute
--- a/recipes/compute.rb
+++ b/recipes/compute.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-compute
 # Recipe:: compute
--- a/recipes/conductor.rb
+++ b/recipes/conductor.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: nova
 # Recipe:: conductor
--- a/recipes/identity_registration.rb
+++ b/recipes/identity_registration.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-compute
 # Recipe:: identity_registration
--- a/recipes/libvirt.rb
+++ b/recipes/libvirt.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-compute
 # Recipe:: libvirt
--- a/recipes/nova-common.rb
+++ b/recipes/nova-common.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-compute
 # Recipe:: nova-common
--- a/recipes/nova-setup.rb
+++ b/recipes/nova-setup.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-compute
 # Recipe:: nova-setup
--- a/recipes/placement_api.rb
+++ b/recipes/placement_api.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-compute
 # Recipe:: placement-api
--- a/recipes/scheduler.rb
+++ b/recipes/scheduler.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-compute
 # Recipe:: scheduler
--- a/recipes/serialproxy.rb
+++ b/recipes/serialproxy.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-compute
 # Recipe:: serialproxy
--- a/recipes/vncproxy.rb
+++ b/recipes/vncproxy.rb
@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Cookbook:: openstack-compute
 # Recipe:: vncproxy
--- a/spec/_nova_apache_spec.rb
+++ b/spec/_nova_apache_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::_nova_apache' do
--- a/spec/_nova_cell_spec.rb
+++ b/spec/_nova_cell_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::_nova_cell' do
--- a/spec/api-metadata-redhat_spec.rb
+++ b/spec/api-metadata-redhat_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::api-metadata' do
--- a/spec/api-metadata_spec.rb
+++ b/spec/api-metadata_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::api-metadata' do
@ -50,7 +48,7 @@ describe 'openstack-compute::api-metadata' do
          log_dir: '/var/log/apache2',
          processes: 2,
          protocol: '',
-          run_dir: '/var/lock/apache2',
+          run_dir: '/var/lock',
          server_entry: '/usr/bin/nova-metadata-wsgi',
          server_host: '127.0.0.1',
          server_port: '8775',
@ -68,7 +66,7 @@ describe 'openstack-compute::api-metadata' do
      /WSGIApplicationGroup %{GLOBAL}$/,
      %r{ErrorLog /var/log/apache2/nova-metadata_error.log$},
      %r{CustomLog /var/log/apache2/nova-metadata_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/nova-metadata.conf').with_content(line)
--- a/spec/api-os-compute-redhat_spec.rb
+++ b/spec/api-os-compute-redhat_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::api-os-compute' do
--- a/spec/api-os-compute_spec.rb
+++ b/spec/api-os-compute_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::api-os-compute' do
@ -59,7 +57,7 @@ describe 'openstack-compute::api-os-compute' do
          log_dir: '/var/log/apache2',
          processes: 6,
          protocol: '',
-          run_dir: '/var/lock/apache2',
+          run_dir: '/var/lock',
          server_entry: '/usr/bin/nova-api-wsgi',
          server_host: '127.0.0.1',
          server_port: '8774',
@ -77,7 +75,7 @@ describe 'openstack-compute::api-os-compute' do
      /WSGIApplicationGroup %{GLOBAL}$/,
      %r{ErrorLog /var/log/apache2/nova-api_error.log$},
      %r{CustomLog /var/log/apache2/nova-api_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/nova-api.conf').with_content(line)
--- a/spec/compute-redhat_spec.rb
+++ b/spec/compute-redhat_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::compute' do
--- a/spec/compute_spec.rb
+++ b/spec/compute_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::compute' do
--- a/spec/conductor_redhat_spec.rb
+++ b/spec/conductor_redhat_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::conductor' do
--- a/spec/conductor_spec.rb
+++ b/spec/conductor_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::conductor' do
--- a/spec/identity_registration_spec.rb
+++ b/spec/identity_registration_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::identity_registration' do
--- a/spec/libvirt-redhat_spec.rb
+++ b/spec/libvirt-redhat_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::libvirt' do
--- a/spec/libvirt_spec.rb
+++ b/spec/libvirt_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::libvirt' do
--- a/spec/nova-common-redhat_spec.rb
+++ b/spec/nova-common-redhat_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::nova-common' do
--- a/spec/nova-common_spec.rb
+++ b/spec/nova-common_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::nova-common' do
--- a/spec/nova-setup_spec.rb
+++ b/spec/nova-setup_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::nova-setup' do
--- a/spec/placement_api-redhat_spec.rb
+++ b/spec/placement_api-redhat_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::placement_api' do
--- a/spec/placement_api_spec.rb
+++ b/spec/placement_api_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::placement_api' do
@ -110,7 +108,7 @@ describe 'openstack-compute::placement_api' do
          log_dir: '/var/log/apache2',
          processes: 2,
          protocol: '',
-          run_dir: '/var/lock/apache2',
+          run_dir: '/var/lock',
          server_entry: '/usr/bin/placement-api',
          server_host: '127.0.0.1',
          server_port: '8778',
@ -128,7 +126,7 @@ describe 'openstack-compute::placement_api' do
      /WSGIApplicationGroup %{GLOBAL}$/,
      %r{ErrorLog /var/log/apache2/placement-api_error.log$},
      %r{CustomLog /var/log/apache2/placement-api_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/placement.conf').with_content(line)
--- a/spec/scheduler-redhat_spec.rb
+++ b/spec/scheduler-redhat_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::scheduler' do
--- a/spec/scheduler_spec.rb
+++ b/spec/scheduler_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::scheduler' do
--- a/spec/serialproxy-redhat_spec.rb
+++ b/spec/serialproxy-redhat_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::serialproxy' do
--- a/spec/serialproxy_spec.rb
+++ b/spec/serialproxy_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::serialproxy' do
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require 'chefspec'
 require 'chefspec/berkshelf'
 require 'chef/application'
--- a/spec/vncproxy-redhat_spec.rb
+++ b/spec/vncproxy-redhat_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::vncproxy' do
--- a/spec/vncproxy_spec.rb
+++ b/spec/vncproxy_spec.rb
@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require_relative 'spec_helper'

 describe 'openstack-compute::vncproxy' do