From 2e5dd8c317b2d9cc0443bd1d7ee6eae9c26f43aa Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Mon, 5 Oct 2020 17:17:41 -0700 Subject: [PATCH] Cookstyle 6.19.5 fixes Update ChefSpec due to changes made in apache2 cookbook. Depends-On: https://review.opendev.org/756168 Change-Id: Ie849f5bae082e94581146793f964d0e001a7c8c8 Signed-off-by: Lance Albertson --- attributes/default.rb | 1 - recipes/api.rb | 1 - recipes/backup.rb | 1 - recipes/cinder-common.rb | 1 - recipes/identity_registration.rb | 1 - recipes/scheduler.rb | 1 - recipes/volume.rb | 1 - recipes/volume_driver_lvm.rb | 1 - spec/api-redhat_spec.rb | 1 - spec/api_spec.rb | 5 ++--- spec/backup-redhat_spec.rb | 1 - spec/backup_spec.rb | 1 - spec/cinder_common-redhat_spec.rb | 1 - spec/cinder_common_spec.rb | 1 - spec/identity_registration_spec.rb | 1 - spec/scheduler-redhat_spec.rb | 1 - spec/scheduler_spec.rb | 1 - spec/spec_helper.rb | 1 - spec/volume-redhat_spec.rb | 1 - spec/volume_spec.rb | 1 - 20 files changed, 2 insertions(+), 22 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 85254ba..30337b6 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage # Attributes:: default diff --git a/recipes/api.rb b/recipes/api.rb index 9110a31..ce40645 100644 --- a/recipes/api.rb +++ b/recipes/api.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage # Recipe:: api diff --git a/recipes/backup.rb b/recipes/backup.rb index fdd4bbe..2ef6c7c 100644 --- a/recipes/backup.rb +++ b/recipes/backup.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage # Recipe:: backup diff --git a/recipes/cinder-common.rb b/recipes/cinder-common.rb index 925e9d1..0824df3 100644 --- a/recipes/cinder-common.rb +++ b/recipes/cinder-common.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage # Recipe:: cinder-common diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb index 2891c8a..259f85e 100644 --- a/recipes/identity_registration.rb +++ b/recipes/identity_registration.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage # Recipe:: identity_registration diff --git a/recipes/scheduler.rb b/recipes/scheduler.rb index c628dbc..6424803 100644 --- a/recipes/scheduler.rb +++ b/recipes/scheduler.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage # Recipe:: scheduler diff --git a/recipes/volume.rb b/recipes/volume.rb index 348516e..21ac1bd 100644 --- a/recipes/volume.rb +++ b/recipes/volume.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage # Recipe:: volume diff --git a/recipes/volume_driver_lvm.rb b/recipes/volume_driver_lvm.rb index 726da9d..20e57f7 100644 --- a/recipes/volume_driver_lvm.rb +++ b/recipes/volume_driver_lvm.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage # Recipe:: volume_driver_lvm diff --git a/spec/api-redhat_spec.rb b/spec/api-redhat_spec.rb index 1c9005b..5f69485 100644 --- a/spec/api-redhat_spec.rb +++ b/spec/api-redhat_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage diff --git a/spec/api_spec.rb b/spec/api_spec.rb index f3d5878..b601fb9 100644 --- a/spec/api_spec.rb +++ b/spec/api_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage @@ -45,7 +44,7 @@ describe 'openstack-block-storage::api' do daemon_process: 'cinder-wsgi', group: 'cinder', log_dir: '/var/log/apache2', - run_dir: '/var/lock/apache2', + run_dir: '/var/lock', server_entry: '/usr/bin/cinder-wsgi', server_host: '127.0.0.1', server_port: '8776', @@ -61,7 +60,7 @@ describe 'openstack-block-storage::api' do %r{WSGIScriptAlias / /usr/bin/cinder-wsgi}, %r{ErrorLog /var/log/apache2/cinder-wsgi_error.log}, %r{CustomLog /var/log/apache2/cinder-wsgi_access.log combined}, - %r{WSGISocketPrefix /var/lock/apache2}, + %r{WSGISocketPrefix /var/lock}, ].each do |line| expect(chef_run).to render_file(file).with_content(line) end diff --git a/spec/backup-redhat_spec.rb b/spec/backup-redhat_spec.rb index e6a8356..39ce932 100644 --- a/spec/backup-redhat_spec.rb +++ b/spec/backup-redhat_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage diff --git a/spec/backup_spec.rb b/spec/backup_spec.rb index 6778aab..eaeb4d7 100644 --- a/spec/backup_spec.rb +++ b/spec/backup_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage diff --git a/spec/cinder_common-redhat_spec.rb b/spec/cinder_common-redhat_spec.rb index 8dae0a9..cfa41ac 100644 --- a/spec/cinder_common-redhat_spec.rb +++ b/spec/cinder_common-redhat_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb index 06d9d90..2404c41 100644 --- a/spec/cinder_common_spec.rb +++ b/spec/cinder_common_spec.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 # # Cookbook:: openstack-block-storage diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb index b11cf92..0983cdd 100644 --- a/spec/identity_registration_spec.rb +++ b/spec/identity_registration_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage diff --git a/spec/scheduler-redhat_spec.rb b/spec/scheduler-redhat_spec.rb index 1e577b6..d855f39 100644 --- a/spec/scheduler-redhat_spec.rb +++ b/spec/scheduler-redhat_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage diff --git a/spec/scheduler_spec.rb b/spec/scheduler_spec.rb index bff2eb7..54e10e9 100644 --- a/spec/scheduler_spec.rb +++ b/spec/scheduler_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4df81e0..74cbef7 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage diff --git a/spec/volume-redhat_spec.rb b/spec/volume-redhat_spec.rb index fb7747b..405f1d1 100644 --- a/spec/volume-redhat_spec.rb +++ b/spec/volume-redhat_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb index 029850e..415e608 100644 --- a/spec/volume_spec.rb +++ b/spec/volume_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Cookbook:: openstack-block-storage