openstack/devstack-gate
Code Issues Proposed changes

Merge "Support grenade-svm-rolling rename to *-partial-ncpu"

Browse Source
This commit is contained in:
Jenkins
2014-02-24 03:17:37 +00:00
committed by Gerrit Code Review
parent 3fa8c9d2b8 aa1e59dcc5
commit 0321a76ace
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
devstack-vm-gate-wrap.sh
View File

@@ -184,9 +184,8 @@ export TEMPEST_CONCURRENCY=${TEMPEST_CONCURRENCY:-${DEFAULT_CONCURRENCY}}
# DGGF=1 means stable/havana => master (or stable/icehouse if that's out)
export DEVSTACK_GATE_GRENADE=${DEVSTACK_GATE_GRENADE:-0}
export DEVSTACK_GATE_GRENADE_FORWARD=${DEVSTACK_GATE_GRENADE_FORWARD:-0}
# DGGR=1 means do a rolling upgrade, where the resulting state is mix of
# new and old services.
export DEVSTACK_GATE_GRENADE_ROLLING=${DEVSTACK_GATE_GRENADE_ROLLING:-0}
# DGGPN=1 means upgrade everything but n-cpu.
export DEVSTACK_GATE_GRENADE_PARTIAL_NCPU=${DEVSTACK_GATE_GRENADE_PARTIAL_NCPU:-0}
if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
export DEVSTACK_GATE_TEMPEST=1

4
devstack-vm-gate.sh
View File

@@ -215,8 +215,8 @@ EOF
else
echo "GRENADE_PHASE=target" >> localrc
fi
if [ "$DEVSTACK_GATE_GRENADE_ROLLING" -eq "1" ]; then
echo "NOVA_COMPUTE_ROLLING_UPGRADE=True" >> localrc
if [ "$DEVSTACK_GATE_GRENADE_PARTIAL_NCPU" -eq "1" ]; then
echo "DO_NOT_UPGRADE_SERVICES=[n-cpu]" >> localrc
fi
else
# Grenade needs screen, so only turn this off if we aren't