commit 5178e1c9374308b76e82b5fde9da1bcc0c8c6935 Author: Lance Albertson Date: Mon Oct 5 17:29:04 2020 -0700 Cookstyle 6.19.5 fixes Depends-On: https://review.opendev.org/756168 Change-Id: Idfa343580b1dce6860d522ca62b63b818353aab8 Signed-off-by: Lance Albertson diff --git a/attributes/default.rb b/attributes/default.rb index d3b3571..cf892a0 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-orchestration # Attributes:: default diff --git a/attributes/heat_conf.rb b/attributes/heat_conf.rb index e81cc63..d79de21 100644 --- a/attributes/heat_conf.rb +++ b/attributes/heat_conf.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-orchestration # Attributes:: default diff --git a/recipes/api-cfn.rb b/recipes/api-cfn.rb index 6d20b9f..da82715 100644 --- a/recipes/api-cfn.rb +++ b/recipes/api-cfn.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-orchestration # Recipe:: api-cfn diff --git a/recipes/api.rb b/recipes/api.rb index 98e3208..ba74e1f 100644 --- a/recipes/api.rb +++ b/recipes/api.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-orchestration # Recipe:: api diff --git a/recipes/common.rb b/recipes/common.rb index 7ba34ac..274b133 100644 --- a/recipes/common.rb +++ b/recipes/common.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-orchestration # Recipe:: engine diff --git a/recipes/dashboard.rb b/recipes/dashboard.rb index 9d1a7f0..e70fb36 100644 --- a/recipes/dashboard.rb +++ b/recipes/dashboard.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-orchestration # Recipe:: dashboard diff --git a/recipes/engine.rb b/recipes/engine.rb index ce552aa..831f439 100644 --- a/recipes/engine.rb +++ b/recipes/engine.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-orchestration # Recipe:: engine diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb index c832141..c21c19f 100644 --- a/recipes/identity_registration.rb +++ b/recipes/identity_registration.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-orchestration # Recipe:: identity_registration diff --git a/spec/api-cfn-redhat_spec.rb b/spec/api-cfn-redhat_spec.rb index e32b643..fa36720 100644 --- a/spec/api-cfn-redhat_spec.rb +++ b/spec/api-cfn-redhat_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 require_relative 'spec_helper' describe 'openstack-orchestration::api-cfn' do diff --git a/spec/api-cfn_spec.rb b/spec/api-cfn_spec.rb index 84cf7d3..4f5cef3 100644 --- a/spec/api-cfn_spec.rb +++ b/spec/api-cfn_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 require_relative 'spec_helper' describe 'openstack-orchestration::api-cfn' do diff --git a/spec/api-redhat_spec.rb b/spec/api-redhat_spec.rb index 17efc39..c164798 100644 --- a/spec/api-redhat_spec.rb +++ b/spec/api-redhat_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 require_relative 'spec_helper' describe 'openstack-orchestration::api' do diff --git a/spec/api_spec.rb b/spec/api_spec.rb index 59df7df..225c8bc 100644 --- a/spec/api_spec.rb +++ b/spec/api_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 require_relative 'spec_helper' describe 'openstack-orchestration::api' do diff --git a/spec/common-redhat_spec.rb b/spec/common-redhat_spec.rb index b6355c3..720a962 100644 --- a/spec/common-redhat_spec.rb +++ b/spec/common-redhat_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 require_relative 'spec_helper' describe 'openstack-orchestration::common' do diff --git a/spec/common_spec.rb b/spec/common_spec.rb index 1014661..6c9f1e4 100644 --- a/spec/common_spec.rb +++ b/spec/common_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 require_relative 'spec_helper' describe 'openstack-orchestration::common' do diff --git a/spec/dashboard-redhat_spec.rb b/spec/dashboard-redhat_spec.rb index 2b5be91..447b05d 100644 --- a/spec/dashboard-redhat_spec.rb +++ b/spec/dashboard-redhat_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 require_relative 'spec_helper' describe 'openstack-orchestration::dashboard' do diff --git a/spec/dashboard_spec.rb b/spec/dashboard_spec.rb index 18cf2da..9987bb2 100644 --- a/spec/dashboard_spec.rb +++ b/spec/dashboard_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 require_relative 'spec_helper' describe 'openstack-orchestration::dashboard' do diff --git a/spec/engine-redhat_spec.rb b/spec/engine-redhat_spec.rb index 03c77d5..ee12f3f 100644 --- a/spec/engine-redhat_spec.rb +++ b/spec/engine-redhat_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 require_relative 'spec_helper' describe 'openstack-orchestration::engine' do diff --git a/spec/engine_spec.rb b/spec/engine_spec.rb index 0f7c2ad..68c7dc3 100644 --- a/spec/engine_spec.rb +++ b/spec/engine_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 require_relative 'spec_helper' describe 'openstack-orchestration::engine' do diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb index 608def5..31541d0 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-orchestration::identity_registration' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 40b648a..da5396f 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'