Cookstyle 6.19.5 fixes

Update ChefSpec due to changes made in apache2 cookbook.

Depends-On: https://review.opendev.org/756168
Change-Id: I3ec792c519650b2d95a976ad50419a9b417a3514
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2020-10-05 17:26:51 -07:00
parent d645ef3f5e
commit af47ea6ef5
41 changed files with 6 additions and 74 deletions

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
#
# Set to some text value if you want templated config files # Set to some text value if you want templated config files
# to contain a custom banner at the top of the written file # to contain a custom banner at the top of the written file

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
#
# Set to some text value if you want templated config files # Set to some text value if you want templated config files
# to contain a custom banner at the top of the written file # to contain a custom banner at the top of the written file

View File

@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-compute # Cookbook:: openstack-compute
# Recipe:: _nova_apache # Recipe:: _nova_apache

View File

@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-compute # Cookbook:: openstack-compute
# Recipe:: _nova_cell # Recipe:: _nova_cell

View File

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

View File

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

View File

@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-compute # Cookbook:: openstack-compute
# Recipe:: compute # Recipe:: compute

View File

@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: nova # Cookbook:: nova
# Recipe:: conductor # Recipe:: conductor

View File

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

View File

@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-compute # Cookbook:: openstack-compute
# Recipe:: libvirt # Recipe:: libvirt

View File

@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-compute # Cookbook:: openstack-compute
# Recipe:: nova-common # Recipe:: nova-common

View File

@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-compute # Cookbook:: openstack-compute
# Recipe:: nova-setup # Recipe:: nova-setup

View File

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

View File

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

View File

@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-compute # Cookbook:: openstack-compute
# Recipe:: serialproxy # Recipe:: serialproxy

View File

@ -1,4 +1,3 @@
# encoding: UTF-8
# #
# Cookbook:: openstack-compute # Cookbook:: openstack-compute
# Recipe:: vncproxy # Recipe:: vncproxy

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::_nova_apache' do describe 'openstack-compute::_nova_apache' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::_nova_cell' do describe 'openstack-compute::_nova_cell' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::api-metadata' do describe 'openstack-compute::api-metadata' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::api-metadata' do describe 'openstack-compute::api-metadata' do
@ -50,7 +48,7 @@ describe 'openstack-compute::api-metadata' do
log_dir: '/var/log/apache2', log_dir: '/var/log/apache2',
processes: 2, processes: 2,
protocol: '', protocol: '',
run_dir: '/var/lock/apache2', run_dir: '/var/lock',
server_entry: '/usr/bin/nova-metadata-wsgi', server_entry: '/usr/bin/nova-metadata-wsgi',
server_host: '127.0.0.1', server_host: '127.0.0.1',
server_port: '8775', server_port: '8775',
@ -68,7 +66,7 @@ describe 'openstack-compute::api-metadata' do
/WSGIApplicationGroup %{GLOBAL}$/, /WSGIApplicationGroup %{GLOBAL}$/,
%r{ErrorLog /var/log/apache2/nova-metadata_error.log$}, %r{ErrorLog /var/log/apache2/nova-metadata_error.log$},
%r{CustomLog /var/log/apache2/nova-metadata_access.log combined$}, %r{CustomLog /var/log/apache2/nova-metadata_access.log combined$},
%r{WSGISocketPrefix /var/lock/apache2$}, %r{WSGISocketPrefix /var/lock$},
].each do |line| ].each do |line|
it do it do
expect(chef_run).to render_file('/etc/apache2/sites-available/nova-metadata.conf').with_content(line) expect(chef_run).to render_file('/etc/apache2/sites-available/nova-metadata.conf').with_content(line)

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::api-os-compute' do describe 'openstack-compute::api-os-compute' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::api-os-compute' do describe 'openstack-compute::api-os-compute' do
@ -59,7 +57,7 @@ describe 'openstack-compute::api-os-compute' do
log_dir: '/var/log/apache2', log_dir: '/var/log/apache2',
processes: 6, processes: 6,
protocol: '', protocol: '',
run_dir: '/var/lock/apache2', run_dir: '/var/lock',
server_entry: '/usr/bin/nova-api-wsgi', server_entry: '/usr/bin/nova-api-wsgi',
server_host: '127.0.0.1', server_host: '127.0.0.1',
server_port: '8774', server_port: '8774',
@ -77,7 +75,7 @@ describe 'openstack-compute::api-os-compute' do
/WSGIApplicationGroup %{GLOBAL}$/, /WSGIApplicationGroup %{GLOBAL}$/,
%r{ErrorLog /var/log/apache2/nova-api_error.log$}, %r{ErrorLog /var/log/apache2/nova-api_error.log$},
%r{CustomLog /var/log/apache2/nova-api_access.log combined$}, %r{CustomLog /var/log/apache2/nova-api_access.log combined$},
%r{WSGISocketPrefix /var/lock/apache2$}, %r{WSGISocketPrefix /var/lock$},
].each do |line| ].each do |line|
it do it do
expect(chef_run).to render_file('/etc/apache2/sites-available/nova-api.conf').with_content(line) expect(chef_run).to render_file('/etc/apache2/sites-available/nova-api.conf').with_content(line)

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::compute' do describe 'openstack-compute::compute' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::compute' do describe 'openstack-compute::compute' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::conductor' do describe 'openstack-compute::conductor' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::conductor' do describe 'openstack-compute::conductor' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::identity_registration' do describe 'openstack-compute::identity_registration' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::libvirt' do describe 'openstack-compute::libvirt' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::libvirt' do describe 'openstack-compute::libvirt' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::nova-common' do describe 'openstack-compute::nova-common' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::nova-common' do describe 'openstack-compute::nova-common' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::nova-setup' do describe 'openstack-compute::nova-setup' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::placement_api' do describe 'openstack-compute::placement_api' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::placement_api' do describe 'openstack-compute::placement_api' do
@ -110,7 +108,7 @@ describe 'openstack-compute::placement_api' do
log_dir: '/var/log/apache2', log_dir: '/var/log/apache2',
processes: 2, processes: 2,
protocol: '', protocol: '',
run_dir: '/var/lock/apache2', run_dir: '/var/lock',
server_entry: '/usr/bin/placement-api', server_entry: '/usr/bin/placement-api',
server_host: '127.0.0.1', server_host: '127.0.0.1',
server_port: '8778', server_port: '8778',
@ -128,7 +126,7 @@ describe 'openstack-compute::placement_api' do
/WSGIApplicationGroup %{GLOBAL}$/, /WSGIApplicationGroup %{GLOBAL}$/,
%r{ErrorLog /var/log/apache2/placement-api_error.log$}, %r{ErrorLog /var/log/apache2/placement-api_error.log$},
%r{CustomLog /var/log/apache2/placement-api_access.log combined$}, %r{CustomLog /var/log/apache2/placement-api_access.log combined$},
%r{WSGISocketPrefix /var/lock/apache2$}, %r{WSGISocketPrefix /var/lock$},
].each do |line| ].each do |line|
it do it do
expect(chef_run).to render_file('/etc/apache2/sites-available/placement.conf').with_content(line) expect(chef_run).to render_file('/etc/apache2/sites-available/placement.conf').with_content(line)

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::scheduler' do describe 'openstack-compute::scheduler' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::scheduler' do describe 'openstack-compute::scheduler' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::serialproxy' do describe 'openstack-compute::serialproxy' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::serialproxy' do describe 'openstack-compute::serialproxy' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require 'chefspec' require 'chefspec'
require 'chefspec/berkshelf' require 'chefspec/berkshelf'
require 'chef/application' require 'chef/application'

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::vncproxy' do describe 'openstack-compute::vncproxy' do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-compute::vncproxy' do describe 'openstack-compute::vncproxy' do