commit c13ea35e3d1f9b3ec0c53be7eff5cf7a15f9cb1a Author: Lance Albertson Date: Mon Oct 5 17:30:51 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: Ia19ea6bebf787f1d8b1542bb6c895a294a5e72bc Signed-off-by: Lance Albertson diff --git a/attributes/default.rb b/attributes/default.rb index 39aa0bd..8549925 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-telemetry # Recipe:: default diff --git a/recipes/agent-central.rb b/recipes/agent-central.rb index 6973e33..5835da4 100644 --- a/recipes/agent-central.rb +++ b/recipes/agent-central.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-telemetry # Recipe:: agent-central diff --git a/recipes/agent-compute.rb b/recipes/agent-compute.rb index c586522..16e6764 100644 --- a/recipes/agent-compute.rb +++ b/recipes/agent-compute.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-telemetry # Recipe:: agent-compute diff --git a/recipes/agent-notification.rb b/recipes/agent-notification.rb index 423b190..201b677 100644 --- a/recipes/agent-notification.rb +++ b/recipes/agent-notification.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-telemetry # Recipe:: agent-notification diff --git a/recipes/aodh.rb b/recipes/aodh.rb index e86913a..c94dc87 100644 --- a/recipes/aodh.rb +++ b/recipes/aodh.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-telemetry # Recipe:: aodh diff --git a/recipes/common.rb b/recipes/common.rb index 570b120..216d25f 100644 --- a/recipes/common.rb +++ b/recipes/common.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-telemetry # Recipe:: common diff --git a/recipes/gnocchi_configure.rb b/recipes/gnocchi_configure.rb index 5103f21..efae91d 100644 --- a/recipes/gnocchi_configure.rb +++ b/recipes/gnocchi_configure.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-telemetry # Recipe:: gnocchi_configure diff --git a/recipes/gnocchi_install.rb b/recipes/gnocchi_install.rb index a267bef..7cad2ee 100644 --- a/recipes/gnocchi_install.rb +++ b/recipes/gnocchi_install.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-telemetry # Recipe:: gnocchi_install diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb index 59cffb1..b0a690d 100644 --- a/recipes/identity_registration.rb +++ b/recipes/identity_registration.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-telemetry # Recipe:: identity_registration diff --git a/recipes/setup.rb b/recipes/setup.rb index 229cdc9..559d8cb 100644 --- a/recipes/setup.rb +++ b/recipes/setup.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-telemetry # Recipe:: common diff --git a/spec/agent-central-rhel_spec.rb b/spec/agent-central-rhel_spec.rb index 7779c5b..f8eea0f 100644 --- a/spec/agent-central-rhel_spec.rb +++ b/spec/agent-central-rhel_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require_relative 'spec_helper' describe 'openstack-telemetry::agent-central' do diff --git a/spec/agent-central_spec.rb b/spec/agent-central_spec.rb index 217aa3e..083cd87 100644 --- a/spec/agent-central_spec.rb +++ b/spec/agent-central_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require_relative 'spec_helper' describe 'openstack-telemetry::agent-central' do diff --git a/spec/agent-compute-rhel_spec.rb b/spec/agent-compute-rhel_spec.rb index bcdfb6a..1217a5b 100644 --- a/spec/agent-compute-rhel_spec.rb +++ b/spec/agent-compute-rhel_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require_relative 'spec_helper' describe 'openstack-telemetry::agent-compute' do diff --git a/spec/agent-compute_spec.rb b/spec/agent-compute_spec.rb index 1e4d9ec..8503d03 100644 --- a/spec/agent-compute_spec.rb +++ b/spec/agent-compute_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require_relative 'spec_helper' describe 'openstack-telemetry::agent-compute' do diff --git a/spec/agent-notification-rhel_spec.rb b/spec/agent-notification-rhel_spec.rb index 01b0096..38ccc4c 100644 --- a/spec/agent-notification-rhel_spec.rb +++ b/spec/agent-notification-rhel_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require_relative 'spec_helper' describe 'openstack-telemetry::agent-notification' do diff --git a/spec/agent-notification_spec.rb b/spec/agent-notification_spec.rb index 68b8ee5..b8d47e5 100644 --- a/spec/agent-notification_spec.rb +++ b/spec/agent-notification_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require_relative 'spec_helper' describe 'openstack-telemetry::agent-notification' do diff --git a/spec/aodh-rhel_spec.rb b/spec/aodh-rhel_spec.rb index 86c89c7..7d80afb 100644 --- a/spec/aodh-rhel_spec.rb +++ b/spec/aodh-rhel_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require_relative 'spec_helper' describe 'openstack-telemetry::aodh' do diff --git a/spec/aodh_spec.rb b/spec/aodh_spec.rb index 74a96e1..2ac35ba 100644 --- a/spec/aodh_spec.rb +++ b/spec/aodh_spec.rb @@ -151,7 +151,7 @@ describe 'openstack-telemetry::aodh' do key_file: '/etc/ceilometer/ssl/private/sslkey.pem', log_dir: '/var/log/apache2', protocol: 'All -SSLv2 -SSLv3', - run_dir: '/var/lock/apache2', + run_dir: '/var/lock', server_entry: '/var/www/html/aodh/app', server_host: '127.0.0.1', server_port: 8042, @@ -171,7 +171,7 @@ describe 'openstack-telemetry::aodh' do /WSGIDaemonProcess aodh-api processes=2 threads=10 user=aodh group=aodh display-name=%{GROUP}$/, /WSGIProcessGroup aodh-api$/, %r{WSGIScriptAlias / /var/www/html/aodh/app$}, - %r{^WSGISocketPrefix /var/lock/apache2$}, + %r{^WSGISocketPrefix /var/lock$}, %r{ErrorLog /var/log/apache2/aodh-api_error.log$}, %r{CustomLog /var/log/apache2/aodh-api_access.log combined$}, ].each do |line| diff --git a/spec/common-rhel_spec.rb b/spec/common-rhel_spec.rb index 3fc7e42..83ac54c 100644 --- a/spec/common-rhel_spec.rb +++ b/spec/common-rhel_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require_relative 'spec_helper' describe 'openstack-telemetry::common' do diff --git a/spec/common_spec.rb b/spec/common_spec.rb index 12140da..eddf8a2 100644 --- a/spec/common_spec.rb +++ b/spec/common_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require_relative 'spec_helper' describe 'openstack-telemetry::common' do diff --git a/spec/gnocchi_configure-rhel_spec.rb b/spec/gnocchi_configure-rhel_spec.rb index b9be0f7..18758cb 100644 --- a/spec/gnocchi_configure-rhel_spec.rb +++ b/spec/gnocchi_configure-rhel_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require_relative 'spec_helper' describe 'openstack-telemetry::gnocchi_configure' do diff --git a/spec/gnocchi_configure_spec.rb b/spec/gnocchi_configure_spec.rb index 9448b36..ebd0a5e 100644 --- a/spec/gnocchi_configure_spec.rb +++ b/spec/gnocchi_configure_spec.rb @@ -183,7 +183,7 @@ describe 'openstack-telemetry::gnocchi_configure' do log_debug: nil, log_dir: '/var/log/apache2', protocol: 'All -SSLv2 -SSLv3', - run_dir: '/var/lock/apache2', + run_dir: '/var/lock', server_entry: '/var/www/html/gnocchi/app', server_host: '127.0.0.1', server_port: 8041, @@ -203,7 +203,7 @@ describe 'openstack-telemetry::gnocchi_configure' do /WSGIDaemonProcess gnocchi-api processes=2 threads=10 user=gnocchi group=gnocchi display-name=%{GROUP}$/, /WSGIProcessGroup gnocchi-api$/, %r{WSGIScriptAlias / /var/www/html/gnocchi/app$}, - %r{^WSGISocketPrefix /var/lock/apache2$}, + %r{^WSGISocketPrefix /var/lock$}, %r{ErrorLog /var/log/apache2/gnocchi-api_error.log$}, %r{CustomLog /var/log/apache2/gnocchi-api_access.log combined$}, ].each do |line| diff --git a/spec/gnocchi_install-rhel_spec.rb b/spec/gnocchi_install-rhel_spec.rb index 2bf32cc..d09bb63 100644 --- a/spec/gnocchi_install-rhel_spec.rb +++ b/spec/gnocchi_install-rhel_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require_relative 'spec_helper' describe 'openstack-telemetry::gnocchi_install' do diff --git a/spec/gnocchi_install_spec.rb b/spec/gnocchi_install_spec.rb index 907eeb9..8661f30 100644 --- a/spec/gnocchi_install_spec.rb +++ b/spec/gnocchi_install_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require_relative 'spec_helper' describe 'openstack-telemetry::gnocchi_install' do diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb index 84de9e5..ddc457d 100644 --- 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-telemetry::identity_registration' do diff --git a/spec/setup_spec.rb b/spec/setup_spec.rb index 82a60e5..f73b224 100644 --- a/spec/setup_spec.rb +++ b/spec/setup_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require_relative 'spec_helper' describe 'openstack-telemetry::setup' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cf47c89..6070b68 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 require 'chefspec' require 'chefspec/berkshelf' require 'chef/application'