openstack/cookbook-openstack-block-storage
Code Issues Proposed changes

Cookstyle 6.19.5 fixes

Browse Source 
Update ChefSpec due to changes made in apache2 cookbook.

Depends-On: https://review.opendev.org/756168
Change-Id: Ie849f5bae082e94581146793f964d0e001a7c8c8
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson
2020-10-05 17:17:41 -07:00
parent ad8219b6d1
commit 2e5dd8c317
20 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
attributes/default.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage
# Attributes:: default # Attributes:: default

1
recipes/api.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage
# Recipe:: api # Recipe:: api

1
recipes/backup.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage
# Recipe:: backup # Recipe:: backup

1
recipes/cinder-common.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage
# Recipe:: cinder-common # Recipe:: cinder-common

1
recipes/identity_registration.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage
# Recipe:: identity_registration # Recipe:: identity_registration

1
recipes/scheduler.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage
# Recipe:: scheduler # Recipe:: scheduler

1
recipes/volume.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage
# Recipe:: volume # Recipe:: volume

1
recipes/volume_driver_lvm.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage
# Recipe:: volume_driver_lvm # Recipe:: volume_driver_lvm

1
spec/api-redhat_spec.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage

5
spec/api_spec.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage
@@ -45,7 +44,7 @@ describe 'openstack-block-storage::api' do
daemon_process: 'cinder-wsgi', daemon_process: 'cinder-wsgi',
group: 'cinder', group: 'cinder',
log_dir: '/var/log/apache2', log_dir: '/var/log/apache2',
run_dir: '/var/lock/apache2', run_dir: '/var/lock',
server_entry: '/usr/bin/cinder-wsgi', server_entry: '/usr/bin/cinder-wsgi',
server_host: '127.0.0.1', server_host: '127.0.0.1',
server_port: '8776', server_port: '8776',
@@ -61,7 +60,7 @@ describe 'openstack-block-storage::api' do
%r{WSGIScriptAlias / /usr/bin/cinder-wsgi}, %r{WSGIScriptAlias / /usr/bin/cinder-wsgi},
%r{ErrorLog /var/log/apache2/cinder-wsgi_error.log}, %r{ErrorLog /var/log/apache2/cinder-wsgi_error.log},
%r{CustomLog /var/log/apache2/cinder-wsgi_access.log combined}, %r{CustomLog /var/log/apache2/cinder-wsgi_access.log combined},
%r{WSGISocketPrefix /var/lock/apache2}, %r{WSGISocketPrefix /var/lock},
].each do |line| ].each do |line|
expect(chef_run).to render_file(file).with_content(line) expect(chef_run).to render_file(file).with_content(line)
end end

1
spec/backup-redhat_spec.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage

1
spec/backup_spec.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage

1
spec/cinder_common-redhat_spec.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage

1
spec/cinder_common_spec.rb
View File

@@ -1,4 +1,3 @@
# encoding: utf-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage

1
spec/identity_registration_spec.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage

1
spec/scheduler-redhat_spec.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage

1
spec/scheduler_spec.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage

1
spec/spec_helper.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage

1
spec/volume-redhat_spec.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage

1
spec/volume_spec.rb
View File

@@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-block-storage # Cookbook:: openstack-block-storage