diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 874f18b9..12f1cdab 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -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
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 9f4951fb..c8abbb3d 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -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