openstack
/
tripleo-ci
Code Issues Proposed changes

Use low-memory-usage.yaml in ci 

Now that we have an environment in t-h-t that is designed to do the
same thing, we should use it instead of the ci-specific version.

Because the ci file had extraconfig as well, we have to leave it
for now, but we should probably move those settings to the t-h-t
version of the file as well.

Change-Id: I9d3ec8b698ca2ee985334f40ad8cd495c90db9b7
This commit is contained in:
Ben Nemec 2016-09-22 16:50:04 +00:00
parent 0c52118233
commit 00a28469a7
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/deploy.sh
View File

@ -153,9 +153,10 @@ if [ "$MULTINODE" = "1" ]; then
fi
if [ $OVERCLOUD == 1 ] ; then
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"
export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
else
export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
fi
start_metric "tripleo.overcloud.${TOCI_JOBTYPE}.deploy.seconds"
http_proxy= $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-deploy ${TRIPLEO_SH_ARGS:-}
@ -176,9 +177,10 @@ if [ -n "${OVERCLOUD_UPDATE_ARGS:-}" ] ; then
sudo rpm -ev --nodeps openstack-tripleo-heat-templates
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"
export OVERCLOUD_UPDATE_ARGS="$OVERCLOUD_UPDATE_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
else
export OVERCLOUD_UPDATE_ARGS="$OVERCLOUD_UPDATE_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
fi
http_proxy= $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-update ${TRIPLEO_SH_ARGS:-}
fi

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

@ -1,13 +1,7 @@
# TODO(bnemec): Should these settings be moved to low-memory-usage.yaml
# in tripleo-heat-templates?
parameter_defaults:
controllerExtraConfig:
heat::api_cloudwatch::enabled: false
heat::api_cfn::enabled: false
heat::rpc_response_timeout: 600
HeatWorkers: 1
CeilometerWorkers: 1
CinderWorkers: 1
GlanceWorkers: 1
KeystoneWorkers: 4
NeutronWorkers: 1
NovaWorkers: 1
SwiftWorkers: 1