openstack/openstack-ansible
Code Issues Proposed changes

Optimise the workers used for all services for the AIO

Browse Source 
The current default number of worker threads for the AIO consumes too many
resources, resulting in gate check failures.

This patch implements a set of sane defaults for the AIO, reducing the
number of workers for most services to 2.

Implements: blueprint gate-split
Change-Id: I553c6aa8711fa85434547585d3a56cca47539fa0
This commit is contained in:
Jesse Pretorius 2015-11-23 19:34:09 +00:00
parent 30963fe490
commit 8e52fbb2f2
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/bootstrap-aio.sh
View File

@ -378,10 +378,30 @@ echo "required_kernel: $(uname --kernel-release)" | tee -a /etc/openstack_deploy
echo "lxc_container_template_main_apt_repo: ${UBUNTU_REPO}" | tee -a /etc/openstack_deploy/user_variables.yml
echo "lxc_container_template_security_apt_repo: ${UBUNTU_SEC_REPO}" | tee -a /etc/openstack_deploy/user_variables.yml
# Set the running neutron workers to 0/1
echo "neutron_api_workers: 0" | tee -a /etc/openstack_deploy/user_variables.yml
echo "neutron_rpc_workers: 0" | tee -a /etc/openstack_deploy/user_variables.yml
echo "neutron_metadata_workers: 1" | tee -a /etc/openstack_deploy/user_variables.yml
# Optimise the worker settings for an AIO
tee -a /etc/openstack_deploy/user_variables.yml << EOF
ceilometer_api_workers: 2
ceilometer_collector_workers: 2
ceilometer_notification_workers: 2
cinder_osapi_volume_workers: 2
glance_api_workers: 2
glance_registry_workers: 2
heat_api_workers: 2
heat_engine_workers: 2
horizon_wsgi_processes: 2
horizon_wsgi_threads: 2
keystone_wsgi_processes: 2
neutron_api_workers: 2
neutron_metadata_workers: 1
neutron_rpc_workers: 1
nova_conductor_workers: 2
nova_metadata_workers: 2
nova_osapi_compute_workers: 2
swift_account_server_workers: 2
swift_container_server_workers: 2
swift_object_server_workers: 2
swift_proxy_server_workers: 2
EOF
# Add in swift vars if needed
if [ "${DEPLOY_SWIFT}" == "yes" ]; then

4
scripts/gate-check-commit.sh
View File

@ -106,10 +106,6 @@ echo "lxc_net_address: 10.255.255.1" | tee -a /etc/openstack_deploy/user_variabl
echo "lxc_net_netmask: 255.255.255.0" | tee -a /etc/openstack_deploy/user_variables.yml
echo "lxc_net_dhcp_range: 10.255.255.2,10.255.255.253" | tee -a /etc/openstack_deploy/user_variables.yml
# Limit the number of processes used by Keystone
# The defaults cause tempest failures in OpenStack CI due to resource constraints
echo "keystone_wsgi_processes: 4" | tee -a /etc/openstack_deploy/user_variables.yml
# Disable the python output buffering so that jenkins gets the output properly
export PYTHONUNBUFFERED=1