openstack
/
tripleo-ci
Code Issues Proposed changes

Take mixed upgrade into account for boostrap_subnode_minimal. 

In mixed upgrade, we have to check the UPGRADE_RELEASE to know the
version of the overcloud.

Change-Id: Ib34fc0220883c2dc02884e0f09a3c87980089438
This commit is contained in:
Sofer Athlan-Guyot 2018-02-14 12:26:57 +01:00 committed by Athlan-Guyot sofer
parent b27ca60c33
commit d3defcfd29
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toci_gate_test-oooq.sh
View File

@ -264,10 +264,12 @@ else
# multinode bootstrap script
export DO_BOOTSTRAP_SUBNODES=${DO_BOOTSTRAP_SUBNODES:-1}
export BOOTSTRAP_SUBNODES_MINIMAL=0
if [[ -z $STABLE_RELEASE || "$STABLE_RELEASE" != "newton" ]]; then
BOOTSTRAP_SUBNODES_MINIMAL=1
export BOOTSTRAP_SUBNODES_MINIMAL=1
overcloud_release=${UPGRADE_RELEASE:-$STABLE_RELEASE}
if [ "${overcloud_release}" = "newton" ]; then
BOOTSTRAP_SUBNODES_MINIMAL=0
fi
echo_vars_to_deploy_env_oooq
subnodes_scp_deploy_env
if [ "$DO_BOOTSTRAP_SUBNODES" = "1" ]; then