openstack/cookbook-openstack-compute
Code Issues Proposed changes

Set threads=1 for other wsgi-based services

Browse Source 
In [0] we followed the release-note about using threads=1 for the nova-api
service, but missed that the nova-metadata and placement service are
affected by the same issue.

[0] Iebf78d24c57a069eabced1bf35051cbae5014902

Conflicts:
	attributes/default.rb
	attributes/placement.rb
	spec/placement_api_spec.rb

Bumped minor version for stable branch.

Change-Id: I9107ca1a135ac090dc9cf80b5192eed4838595df
(cherry picked from commit 4b796ce2fb)
This commit is contained in:
Jens Harbott
2021-06-01 14:20:50 +02:00
parent d1d83acdeb
commit 436b3585a9
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
attributes/default.rb
View File

@@ -39,13 +39,13 @@ default['openstack']['compute']['rootwrap']['syslog_log_level'] = 'ERROR'
default['openstack']['compute'][service]['ssl']['ciphers'] = ''
end
# Work around upstream issue with running the api service under wsgi
# Work around upstream issue with running the api services under wsgi
# https://docs.openstack.org/releasenotes/nova/stein.html#known-issues
default['openstack']['compute']['api']['threads'] = 1
default['openstack']['compute']['api']['processes'] = 6
default['openstack']['compute']['placement']['threads'] = 10
default['openstack']['compute']['placement']['threads'] = 1
default['openstack']['compute']['placement']['processes'] = 2
default['openstack']['compute']['metadata']['threads'] = 10
default['openstack']['compute']['metadata']['threads'] = 1
default['openstack']['compute']['metadata']['processes'] = 2
# Use Nova or Placement. By default use Nova

2
metadata.rb
View File

@@ -5,7 +5,7 @@ issues_url 'https://launchpad.net/openstack-chef'
source_url 'https://opendev.org/openstack/cookbook-openstack-compute'
license 'Apache-2.0'
description 'The OpenStack Compute service Nova.'
version '19.4.0'
version '19.5.0'
chef_version '>= 15.0'

4
spec/api-metadata_spec.rb
View File

@@ -52,7 +52,7 @@ describe 'openstack-compute::api-metadata' do
server_entry: '/usr/bin/nova-metadata-wsgi',
server_host: '127.0.0.1',
server_port: '8775',
threads: 10,
threads: 1,
user: 'nova',
use_ssl: false,
}
@@ -60,7 +60,7 @@ describe 'openstack-compute::api-metadata' do
end
[
/<VirtualHost 127.0.0.1:8775>$/,
/WSGIDaemonProcess nova-metadata processes=2 threads=10 user=nova group=nova display-name=%{GROUP}$/,
/WSGIDaemonProcess nova-metadata processes=2 threads=1 user=nova group=nova display-name=%{GROUP}$/,
/WSGIProcessGroup nova-metadata$/,
%r{WSGIScriptAlias / /usr/bin/nova-metadata-wsgi$},
/WSGIApplicationGroup %{GLOBAL}$/,

8
spec/placement_api_spec.rb
View File

@@ -63,7 +63,7 @@ describe 'openstack-compute::placement_api' do
server_entry: '/usr/bin/nova-placement-api',
server_host: '127.0.0.1',
server_port: '8778',
threads: 10,
threads: 1,
user: 'nova',
use_ssl: false,
}
@@ -71,7 +71,7 @@ describe 'openstack-compute::placement_api' do
end
[
/<VirtualHost 127.0.0.1:8778>$/,
/WSGIDaemonProcess placement-api processes=2 threads=10 user=nova group=nova display-name=%{GROUP}$/,
/WSGIDaemonProcess placement-api processes=2 threads=1 user=nova group=nova display-name=%{GROUP}$/,
/WSGIProcessGroup placement-api$/,
%r{WSGIScriptAlias / /usr/bin/nova-placement-api$},
/WSGIApplicationGroup %{GLOBAL}$/,
@@ -223,7 +223,7 @@ describe 'openstack-compute::placement_api' do
server_entry: '/usr/bin/placement-api',
server_host: '127.0.0.1',
server_port: '8778',
threads: 10,
threads: 1,
user: 'placement',
use_ssl: false,
}
@@ -231,7 +231,7 @@ describe 'openstack-compute::placement_api' do
end
[
/<VirtualHost 127.0.0.1:8778>$/,
/WSGIDaemonProcess placement-api processes=2 threads=10 user=placement group=placement display-name=%{GROUP}$/,
/WSGIDaemonProcess placement-api processes=2 threads=1 user=placement group=placement display-name=%{GROUP}$/,
/WSGIProcessGroup placement-api$/,
%r{WSGIScriptAlias / /usr/bin/placement-api$},
/WSGIApplicationGroup %{GLOBAL}$/,