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:
parent
d645ef3f5e
commit
af47ea6ef5
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
|
||||
# Set to some text value if you want templated config files
|
||||
# to contain a custom banner at the top of the written file
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
|
||||
# Set to some text value if you want templated config files
|
||||
# to contain a custom banner at the top of the written file
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: openstack-compute
|
||||
# Recipe:: _nova_apache
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: openstack-compute
|
||||
# Recipe:: _nova_cell
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: openstack-compute
|
||||
# Recipe:: api-metadata
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: openstack-compute
|
||||
# Recipe:: api-os-compute
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: openstack-compute
|
||||
# Recipe:: compute
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: nova
|
||||
# Recipe:: conductor
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: openstack-compute
|
||||
# Recipe:: identity_registration
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: openstack-compute
|
||||
# Recipe:: libvirt
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: openstack-compute
|
||||
# Recipe:: nova-common
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: openstack-compute
|
||||
# Recipe:: nova-setup
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: openstack-compute
|
||||
# Recipe:: placement-api
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: openstack-compute
|
||||
# Recipe:: scheduler
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: openstack-compute
|
||||
# Recipe:: serialproxy
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
#
|
||||
# Cookbook:: openstack-compute
|
||||
# Recipe:: vncproxy
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::_nova_apache' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::_nova_cell' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::api-metadata' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::api-metadata' do
|
||||
|
@ -50,7 +48,7 @@ describe 'openstack-compute::api-metadata' do
|
|||
log_dir: '/var/log/apache2',
|
||||
processes: 2,
|
||||
protocol: '',
|
||||
run_dir: '/var/lock/apache2',
|
||||
run_dir: '/var/lock',
|
||||
server_entry: '/usr/bin/nova-metadata-wsgi',
|
||||
server_host: '127.0.0.1',
|
||||
server_port: '8775',
|
||||
|
@ -68,7 +66,7 @@ describe 'openstack-compute::api-metadata' do
|
|||
/WSGIApplicationGroup %{GLOBAL}$/,
|
||||
%r{ErrorLog /var/log/apache2/nova-metadata_error.log$},
|
||||
%r{CustomLog /var/log/apache2/nova-metadata_access.log combined$},
|
||||
%r{WSGISocketPrefix /var/lock/apache2$},
|
||||
%r{WSGISocketPrefix /var/lock$},
|
||||
].each do |line|
|
||||
it do
|
||||
expect(chef_run).to render_file('/etc/apache2/sites-available/nova-metadata.conf').with_content(line)
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::api-os-compute' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::api-os-compute' do
|
||||
|
@ -59,7 +57,7 @@ describe 'openstack-compute::api-os-compute' do
|
|||
log_dir: '/var/log/apache2',
|
||||
processes: 6,
|
||||
protocol: '',
|
||||
run_dir: '/var/lock/apache2',
|
||||
run_dir: '/var/lock',
|
||||
server_entry: '/usr/bin/nova-api-wsgi',
|
||||
server_host: '127.0.0.1',
|
||||
server_port: '8774',
|
||||
|
@ -77,7 +75,7 @@ describe 'openstack-compute::api-os-compute' do
|
|||
/WSGIApplicationGroup %{GLOBAL}$/,
|
||||
%r{ErrorLog /var/log/apache2/nova-api_error.log$},
|
||||
%r{CustomLog /var/log/apache2/nova-api_access.log combined$},
|
||||
%r{WSGISocketPrefix /var/lock/apache2$},
|
||||
%r{WSGISocketPrefix /var/lock$},
|
||||
].each do |line|
|
||||
it do
|
||||
expect(chef_run).to render_file('/etc/apache2/sites-available/nova-api.conf').with_content(line)
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::compute' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::compute' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::conductor' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::conductor' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::identity_registration' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::libvirt' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::libvirt' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::nova-common' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::nova-common' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::nova-setup' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::placement_api' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::placement_api' do
|
||||
|
@ -110,7 +108,7 @@ describe 'openstack-compute::placement_api' do
|
|||
log_dir: '/var/log/apache2',
|
||||
processes: 2,
|
||||
protocol: '',
|
||||
run_dir: '/var/lock/apache2',
|
||||
run_dir: '/var/lock',
|
||||
server_entry: '/usr/bin/placement-api',
|
||||
server_host: '127.0.0.1',
|
||||
server_port: '8778',
|
||||
|
@ -128,7 +126,7 @@ describe 'openstack-compute::placement_api' do
|
|||
/WSGIApplicationGroup %{GLOBAL}$/,
|
||||
%r{ErrorLog /var/log/apache2/placement-api_error.log$},
|
||||
%r{CustomLog /var/log/apache2/placement-api_access.log combined$},
|
||||
%r{WSGISocketPrefix /var/lock/apache2$},
|
||||
%r{WSGISocketPrefix /var/lock$},
|
||||
].each do |line|
|
||||
it do
|
||||
expect(chef_run).to render_file('/etc/apache2/sites-available/placement.conf').with_content(line)
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::scheduler' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::scheduler' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::serialproxy' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::serialproxy' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require 'chefspec'
|
||||
require 'chefspec/berkshelf'
|
||||
require 'chef/application'
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::vncproxy' do
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-compute::vncproxy' do
|
||||
|
|
Loading…
Reference in New Issue