From b9f5bf63bc3b44e8982d4e615e350e12015ff63e Mon Sep 17 00:00:00 2001
From: Joe Gordon <joe.gordon0@gmail.com>
Date: Wed, 26 Feb 2014 13:18:33 -0800
Subject: [PATCH] Write DO_NOT_UPGRADE_SERVICES to grenade's localrc not
 devstacks

This should fix check-grenade-dsvm-partial-ncpu which currently isn't
getting DO_NOT_UPGRADE_SERVICES=[n-cpu] written to its localrc file

Change-Id: Ided01c2688c360881e99c794b518021cd0c302c6
---
 devstack-vm-gate-wrap.sh | 5 +++++
 devstack-vm-gate.sh      | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 383dbded..0c64aa77 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -202,6 +202,11 @@ if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
         export GRENADE_OLD_BRANCH="stable/havana"
         export GRENADE_NEW_BRANCH="master"
     fi
+    if [ "$DEVSTACK_GATE_GRENADE_PARTIAL_NCPU" -eq "1" ]; then
+        export DO_NOT_UPGRADE_SERVICES=[n-cpu]
+    else
+        export DO_NOT_UPGRADE_SERVICES=
+    fi
     # the roll forward case
 elif [ "$DEVSTACK_GATE_GRENADE_FORWARD" -eq "1" ]; then
     export DEVSTACK_GATE_TEMPEST=1
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 112f0036..28ccd0de 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -217,9 +217,6 @@ EOF
         else
             echo "GRENADE_PHASE=target" >> localrc
         fi
-        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
         # running grenade.
@@ -257,6 +254,7 @@ TARGET_RELEASE_DIR=$BASE/\$TARGET_RELEASE
 TARGET_DEVSTACK_DIR=\$TARGET_RELEASE_DIR/devstack
 TARGET_RUN_SMOKE=False
 SAVE_DIR=\$BASE_RELEASE_DIR/save
+DO_NOT_UPGRADE_SERVICES=$DO_NOT_UPGRADE_SERVICES
 EOF
     # Make the workspace owned by the stack user
     sudo chown -R stack:stack $BASE