openstack/tripleo-ci
Code Issues Proposed changes

Explicitly set num_engine_workers for mitaka and below

Browse Source 
Since the num_engtine_workers paramter was added [1] in Newton, we
still need to set this parameter for mitaka and below. So we do so by
having a separate environment for those branches.

[1] I69565c13b732ef74531a516aac8a368597411856

Change-Id: I2d9a0ac739b3ee5becdd844640d5e3daee3611e8
This commit is contained in:
Juan Antonio Osorio Robles 2016-04-15 11:42:33 +03:00
parent 2d90550cbc
commit 715d8a6645
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/deploy.sh
View File

@ -7,6 +7,7 @@ source /opt/stack/new/tripleo-ci/scripts/metrics.bash
export DIB_DISTRIBUTION_MIRROR=$CENTOS_MIRROR
export DIB_EPEL_MIRROR=$EPEL_MIRROR
export STABLE_RELEASE=${STABLE_RELEASE:-""}
echo "INFO: Check /var/log/undercloud_install.txt for undercloud install output"
echo "INFO: This file can be found in logs/undercloud.tar.xz in the directory containing console.log"
@ -95,6 +96,9 @@ if [ -n "${OVERCLOUD_UPDATE_ARGS:-}" ] ; then
fi
export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml"
if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
fi
start_metric "tripleo.overcloud.${TOCI_JOBTYPE}.deploy.seconds"
http_proxy= $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-deploy ${TRIPLEO_SH_ARGS:-}
stop_metric "tripleo.overcloud.${TOCI_JOBTYPE}.deploy.seconds"
@ -108,6 +112,9 @@ if [ -n "${OVERCLOUD_UPDATE_ARGS:-}" ] ; then
sudo yum -y install openstack-tripleo-heat-templates
export OVERCLOUD_UPDATE_ARGS="$OVERCLOUD_UPDATE_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml"
if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
OVERCLOUD_UPDATE_ARGS="$OVERCLOUD_UPDATE_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
fi
http_proxy= $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-update ${TRIPLEO_SH_ARGS:-}
fi

7
test-environments/worker-config-mitaka-and-below.yaml Normal file
View File

@ -0,0 +1,7 @@
parameter_defaults:
# HeatWorkers doesn't modify num_engine_workers, so handle
# via heat::config
controllerExtraConfig:
heat::config::heat_config:
DEFAULT/num_engine_workers:
value: 1

2
test-environments/worker-config.yaml
View File

@ -1,6 +1,4 @@
parameter_defaults:
# HeatWorkers doesn't modify num_engine_workers, so handle
# via heat::config
controllerExtraConfig:
heat::api_cloudwatch::enabled: false
heat::api_cfn::enabled: false