commit 8f5801890f36b70a67fb44ffc7b6aa8ca660485a Author: Lance Albertson Date: Mon Oct 5 17:19:17 2020 -0700 Cookstyle 6.19.5 fixes Depends-On: https://review.opendev.org/756168 Change-Id: Id30919fdf1e52405001abe964f434123c867f717 Signed-off-by: Lance Albertson diff --git a/attributes/default.rb b/attributes/default.rb index f8925d1..9ee6269 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-network # Attributes:: default diff --git a/recipes/_bridge_config_example.rb b/recipes/_bridge_config_example.rb index 06aa528..2302fe6 100644 --- a/recipes/_bridge_config_example.rb +++ b/recipes/_bridge_config_example.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: _bridge_config_example diff --git a/recipes/db_migration.rb b/recipes/db_migration.rb index fe40d97..1663d1d 100644 --- a/recipes/db_migration.rb +++ b/recipes/db_migration.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-network # Recipe:: db_migration diff --git a/recipes/default.rb b/recipes/default.rb index 6fcbbdd..4180720 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: default diff --git a/recipes/dhcp_agent.rb b/recipes/dhcp_agent.rb index 2cae0ee..12ca040 100644 --- a/recipes/dhcp_agent.rb +++ b/recipes/dhcp_agent.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: dhcp_agent diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb index 10e2dd6..149972f 100644 --- a/recipes/identity_registration.rb +++ b/recipes/identity_registration.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: identity_registration diff --git a/recipes/l3_agent.rb b/recipes/l3_agent.rb index 65b9f42..f89bf32 100644 --- a/recipes/l3_agent.rb +++ b/recipes/l3_agent.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: l3_agent diff --git a/recipes/metadata_agent.rb b/recipes/metadata_agent.rb index a5e1f2b..845ac41 100644 --- a/recipes/metadata_agent.rb +++ b/recipes/metadata_agent.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: metadata_agent diff --git a/recipes/metering_agent.rb b/recipes/metering_agent.rb index 9ed7204..8d75bc5 100644 --- a/recipes/metering_agent.rb +++ b/recipes/metering_agent.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: metering_agent diff --git a/recipes/ml2_core_plugin.rb b/recipes/ml2_core_plugin.rb index 2d4ef9e..eb04104 100644 --- a/recipes/ml2_core_plugin.rb +++ b/recipes/ml2_core_plugin.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: ml2_core_plugin diff --git a/recipes/ml2_linuxbridge.rb b/recipes/ml2_linuxbridge.rb index 558b8b1..c497210 100644 --- a/recipes/ml2_linuxbridge.rb +++ b/recipes/ml2_linuxbridge.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: ml2_linuxbridge diff --git a/recipes/ml2_openvswitch.rb b/recipes/ml2_openvswitch.rb index 0d93461..6030602 100644 --- a/recipes/ml2_openvswitch.rb +++ b/recipes/ml2_openvswitch.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: ml2_opensvswitch diff --git a/recipes/openvswitch.rb b/recipes/openvswitch.rb index 0196093..67aefd9 100644 --- a/recipes/openvswitch.rb +++ b/recipes/openvswitch.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: opensvswitch diff --git a/recipes/openvswitch_agent.rb b/recipes/openvswitch_agent.rb index cadb51b..734196c 100644 --- a/recipes/openvswitch_agent.rb +++ b/recipes/openvswitch_agent.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: openvswitch_agent diff --git a/recipes/plugin_config.rb b/recipes/plugin_config.rb index e4bbf5d..e49a4a0 100644 --- a/recipes/plugin_config.rb +++ b/recipes/plugin_config.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: plugin_config diff --git a/recipes/server.rb b/recipes/server.rb index 0b73d71..8d6b6bc 100644 --- a/recipes/server.rb +++ b/recipes/server.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # # Cookbook:: openstack-network # Recipe:: server diff --git a/spec/_bridge_config_example_spec.rb b/spec/_bridge_config_example_spec.rb index 0af8696..33fd1c8 100644 --- a/spec/_bridge_config_example_spec.rb +++ b/spec/_bridge_config_example_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::_bridge_config_example' do diff --git a/spec/db_migration_spec.rb b/spec/db_migration_spec.rb index e8e5873..a56f387 100644 --- a/spec/db_migration_spec.rb +++ b/spec/db_migration_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::db_migration' do diff --git a/spec/default-redhat_spec.rb b/spec/default-redhat_spec.rb index 50815da..fa5a854 100644 --- a/spec/default-redhat_spec.rb +++ b/spec/default-redhat_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network' do diff --git a/spec/default_spec.rb b/spec/default_spec.rb index 181b76e..776bc6b 100644 --- a/spec/default_spec.rb +++ b/spec/default_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network' do diff --git a/spec/dhcp_agent-centos_spec.rb b/spec/dhcp_agent-centos_spec.rb index 36cacb2..73f3402 100644 --- a/spec/dhcp_agent-centos_spec.rb +++ b/spec/dhcp_agent-centos_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::dhcp_agent' do diff --git a/spec/dhcp_agent_spec.rb b/spec/dhcp_agent_spec.rb index f0ae821..292c69a 100644 --- a/spec/dhcp_agent_spec.rb +++ b/spec/dhcp_agent_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::dhcp_agent' do diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb index d209474..ad4acec 100644 --- a/spec/identity_registration_spec.rb +++ b/spec/identity_registration_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::identity_registration' do diff --git a/spec/l3_agent-redhat_spec.rb b/spec/l3_agent-redhat_spec.rb index 604185e..3c4a4d3 100644 --- a/spec/l3_agent-redhat_spec.rb +++ b/spec/l3_agent-redhat_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::l3_agent' do diff --git a/spec/l3_agent_spec.rb b/spec/l3_agent_spec.rb index e03b2d3..a87b8bf 100644 --- a/spec/l3_agent_spec.rb +++ b/spec/l3_agent_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::l3_agent' do diff --git a/spec/metadata_agent-rhel_spec.rb b/spec/metadata_agent-rhel_spec.rb index 1d98d89..e4f6796 100644 --- a/spec/metadata_agent-rhel_spec.rb +++ b/spec/metadata_agent-rhel_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::metadata_agent' do diff --git a/spec/metadata_agent_spec.rb b/spec/metadata_agent_spec.rb index 7badea1..ef2a536 100644 --- a/spec/metadata_agent_spec.rb +++ b/spec/metadata_agent_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::metadata_agent' do diff --git a/spec/metering_agent-rhel_spec.rb b/spec/metering_agent-rhel_spec.rb index b98fc85..2bbbd85 100644 --- a/spec/metering_agent-rhel_spec.rb +++ b/spec/metering_agent-rhel_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::metering_agent' do diff --git a/spec/metering_agent_spec.rb b/spec/metering_agent_spec.rb index fd0f277..fcdc961 100644 --- a/spec/metering_agent_spec.rb +++ b/spec/metering_agent_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::metering_agent' do diff --git a/spec/openvswitch-rhel_spec.rb b/spec/openvswitch-rhel_spec.rb index 2b8513b..1426c10 100644 --- a/spec/openvswitch-rhel_spec.rb +++ b/spec/openvswitch-rhel_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::openvswitch' do diff --git a/spec/openvswitch_agent-rhel_spec.rb b/spec/openvswitch_agent-rhel_spec.rb index 1f88d38..3c756c8 100644 --- a/spec/openvswitch_agent-rhel_spec.rb +++ b/spec/openvswitch_agent-rhel_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::openvswitch_agent' do diff --git a/spec/openvswitch_agent_spec.rb b/spec/openvswitch_agent_spec.rb index fbcce84..e743991 100644 --- a/spec/openvswitch_agent_spec.rb +++ b/spec/openvswitch_agent_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::openvswitch_agent' do diff --git a/spec/openvswitch_spec.rb b/spec/openvswitch_spec.rb index eb19407..f34a9cd 100644 --- a/spec/openvswitch_spec.rb +++ b/spec/openvswitch_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::openvswitch' do diff --git a/spec/plugin_config_spec.rb b/spec/plugin_config_spec.rb index df3f5b0..035d50c 100644 --- a/spec/plugin_config_spec.rb +++ b/spec/plugin_config_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::plugin_config' do diff --git a/spec/server-redhat_spec.rb b/spec/server-redhat_spec.rb index 8e59a1f..c3de25f 100644 --- a/spec/server-redhat_spec.rb +++ b/spec/server-redhat_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::server' do diff --git a/spec/server_spec.rb b/spec/server_spec.rb index 3f751e7..f37bb41 100644 --- a/spec/server_spec.rb +++ b/spec/server_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require_relative 'spec_helper' describe 'openstack-network::server' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 49fc4fb..52ea1c0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 require 'chefspec' require 'pry' require 'chefspec/berkshelf'