Browse Source

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>
changes/76/756176/1
Lance Albertson 6 months ago
parent
commit
af47ea6ef5
41 changed files with 6 additions and 74 deletions
  1. +0
    -2
      attributes/default.rb
  2. +0
    -2
      attributes/placement.rb
  3. +0
    -1
      recipes/_nova_apache.rb
  4. +0
    -1
      recipes/_nova_cell.rb
  5. +0
    -1
      recipes/api-metadata.rb
  6. +0
    -1
      recipes/api-os-compute.rb
  7. +0
    -1
      recipes/compute.rb
  8. +0
    -1
      recipes/conductor.rb
  9. +0
    -1
      recipes/identity_registration.rb
  10. +0
    -1
      recipes/libvirt.rb
  11. +0
    -1
      recipes/nova-common.rb
  12. +0
    -1
      recipes/nova-setup.rb
  13. +0
    -1
      recipes/placement_api.rb
  14. +0
    -1
      recipes/scheduler.rb
  15. +0
    -1
      recipes/serialproxy.rb
  16. +0
    -1
      recipes/vncproxy.rb
  17. +0
    -2
      spec/_nova_apache_spec.rb
  18. +0
    -2
      spec/_nova_cell_spec.rb
  19. +0
    -2
      spec/api-metadata-redhat_spec.rb
  20. +2
    -4
      spec/api-metadata_spec.rb
  21. +0
    -2
      spec/api-os-compute-redhat_spec.rb
  22. +2
    -4
      spec/api-os-compute_spec.rb
  23. +0
    -2
      spec/compute-redhat_spec.rb
  24. +0
    -2
      spec/compute_spec.rb
  25. +0
    -2
      spec/conductor_redhat_spec.rb
  26. +0
    -2
      spec/conductor_spec.rb
  27. +0
    -2
      spec/identity_registration_spec.rb
  28. +0
    -2
      spec/libvirt-redhat_spec.rb
  29. +0
    -2
      spec/libvirt_spec.rb
  30. +0
    -2
      spec/nova-common-redhat_spec.rb
  31. +0
    -2
      spec/nova-common_spec.rb
  32. +0
    -2
      spec/nova-setup_spec.rb
  33. +0
    -2
      spec/placement_api-redhat_spec.rb
  34. +2
    -4
      spec/placement_api_spec.rb
  35. +0
    -2
      spec/scheduler-redhat_spec.rb
  36. +0
    -2
      spec/scheduler_spec.rb
  37. +0
    -2
      spec/serialproxy-redhat_spec.rb
  38. +0
    -2
      spec/serialproxy_spec.rb
  39. +0
    -2
      spec/spec_helper.rb
  40. +0
    -2
      spec/vncproxy-redhat_spec.rb
  41. +0
    -2
      spec/vncproxy_spec.rb

+ 0
- 2
attributes/default.rb View 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


+ 0
- 2
attributes/placement.rb View 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


+ 0
- 1
recipes/_nova_apache.rb View File

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


+ 0
- 1
recipes/_nova_cell.rb View File

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


+ 0
- 1
recipes/api-metadata.rb View File

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


+ 0
- 1
recipes/api-os-compute.rb View File

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


+ 0
- 1
recipes/compute.rb View File

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


+ 0
- 1
recipes/conductor.rb View File

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


+ 0
- 1
recipes/identity_registration.rb View File

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


+ 0
- 1
recipes/libvirt.rb View File

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


+ 0
- 1
recipes/nova-common.rb View File

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


+ 0
- 1
recipes/nova-setup.rb View File

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


+ 0
- 1
recipes/placement_api.rb View File

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


+ 0
- 1
recipes/scheduler.rb View File

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


+ 0
- 1
recipes/serialproxy.rb View File

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


+ 0
- 1
recipes/vncproxy.rb View File

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


+ 0
- 2
spec/_nova_apache_spec.rb View File

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


+ 0
- 2
spec/_nova_cell_spec.rb View File

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


+ 0
- 2
spec/api-metadata-redhat_spec.rb View File

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


+ 2
- 4
spec/api-metadata_spec.rb View File

@ -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)


+ 0
- 2
spec/api-os-compute-redhat_spec.rb View File

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


+ 2
- 4
spec/api-os-compute_spec.rb View File

@ -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)


+ 0
- 2
spec/compute-redhat_spec.rb View File

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


+ 0
- 2
spec/compute_spec.rb View File

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


+ 0
- 2
spec/conductor_redhat_spec.rb View File

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


+ 0
- 2
spec/conductor_spec.rb View File

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


+ 0
- 2
spec/identity_registration_spec.rb View File

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


+ 0
- 2
spec/libvirt-redhat_spec.rb View File

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


+ 0
- 2
spec/libvirt_spec.rb View File

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


+ 0
- 2
spec/nova-common-redhat_spec.rb View File

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


+ 0
- 2
spec/nova-common_spec.rb View File

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


+ 0
- 2
spec/nova-setup_spec.rb View File

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


+ 0
- 2
spec/placement_api-redhat_spec.rb View File

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


+ 2
- 4
spec/placement_api_spec.rb View File

@ -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)


+ 0
- 2
spec/scheduler-redhat_spec.rb View File

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


+ 0
- 2
spec/scheduler_spec.rb View File

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


+ 0
- 2
spec/serialproxy-redhat_spec.rb View File

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


+ 0
- 2
spec/serialproxy_spec.rb View File

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


+ 0
- 2
spec/spec_helper.rb View File

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


+ 0
- 2
spec/vncproxy-redhat_spec.rb View File

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


+ 0
- 2
spec/vncproxy_spec.rb View File

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


Loading…
Cancel
Save