bf20657824
This patch change behaviour of launching API services for different numbers of workers: - workers < 0 -> is not allowed - workers == 0 -> as much worker *processes* as CPU cores - workers == 1 -> no child *processes*, single *green thread* - workers > 1 -> specified number of worker *processes* Note: According with old behaviour following services have corresponding defaul values: - heat-api -> '0', instead of function for calculation number of cores. - heat-api-cfn -> '1', instead of '0' (i.e. one *green thread*) - heat-api-cw -> '1', instead of '0' (i.e. one *green thread*) Also updated number of workers for functional tests. It's necessary, because priveous value was '1', which now mean one single thread. (Previously it was one worker). Change-Id: Idebd19c62adea02d9181236f6cbfed090acb32b9 Closes-Bug: #1523390
41 lines
1.6 KiB
Bash
Executable File
41 lines
1.6 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
# This script is executed inside pre_test_hook function in devstack gate.
|
|
|
|
localrc_path=$BASE/new/devstack/localrc
|
|
localconf=$BASE/new/devstack/local.conf
|
|
|
|
echo "CEILOMETER_PIPELINE_INTERVAL=60" >> $localrc_path
|
|
echo "HEAT_ENABLE_ADOPT_ABANDON=True" >> $localrc_path
|
|
|
|
echo -e '[[post-config|$HEAT_CONF]]\n[DEFAULT]\n' >> $localconf
|
|
|
|
if [ "$ENABLE_CONVERGENCE" == "true" ] ; then
|
|
echo -e 'convergence_engine=true\n' >> $localconf
|
|
fi
|
|
|
|
echo -e 'notification_driver=messagingv2\n' >> $localconf
|
|
echo -e 'hidden_stack_tags=hidden\n' >> $localconf
|
|
echo -e 'encrypt_parameters_and_properties=True\n' >> $localconf
|
|
|
|
echo -e '[heat_api]\nworkers=2\n' >> $localconf
|
|
echo -e '[heat_api_cfn]\nworkers=2\n' >> $localconf
|
|
echo -e '[heat_api_cloudwatch]\nworkers=2\n' >> $localconf
|
|
|
|
echo -e '[cache]\nenabled=True\n' >> $localconf
|
|
|
|
echo -e '[[post-config|/etc/neutron/neutron_vpnaas.conf]]\n' >> $localconf
|
|
echo -e '[service_providers]\nservice_provider=VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default' >> $localconf
|