From e86d8e7a9c3a9f15072c0099b89616fd7772c1d0 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@ubuntu.com>
Date: Tue, 18 Nov 2014 12:35:42 -0800
Subject: [PATCH] Update usage of LOCALRC_OLDNEW

A recent patch (#106043) localized and renamed LOCALRC_OLDNEW but
did not update all uses, causing Ironic debug logging to
end up in the wrong place and not archived on the log server.

Change-Id: I6c5b6ad3b563927fa61f79ee339bac754ad0190d
---
 devstack-vm-gate.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 01c636df..0f3a4569 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -157,7 +157,7 @@ EOF
     if [[ "$DEVSTACK_GATE_VIRT_DRIVER" == "ironic" ]]; then
         echo "VIRT_DRIVER=ironic" >>"$localrc_file"
         echo "IRONIC_BAREMETAL_BASIC_OPS=True" >>"$localrc_file"
-        echo "IRONIC_VM_LOG_DIR=$BASE/$LOCALRC_OLDNEW/ironic-bm-logs" >>"$localrc_file"
+        echo "IRONIC_VM_LOG_DIR=$BASE/$localrc_oldnew/ironic-bm-logs" >>"$localrc_file"
         echo "DEFAULT_INSTANCE_TYPE=baremetal" >>"$localrc_file"
         echo "BUILD_TIMEOUT=300" >>"$localrc_file"
         if [[ "$DEVSTACK_GATE_IRONIC_BUILD_RAMDISK" -eq 0 ]]; then
@@ -246,7 +246,7 @@ EOF
     fi
 
     if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
-        if [[ "$LOCALRC_OLDNEW" == "old" ]]; then
+        if [[ "$localrc_old" == "old" ]]; then
             echo "GRENADE_PHASE=base" >> "$localrc_file"
         else
             echo "GRENADE_PHASE=target" >> "$localrc_file"