openstack/devstack-gate
Code Issues Proposed changes

Update usage of LOCALRC_OLDNEW

Browse Source 
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
This commit is contained in:
Adam Gandelman
2014-11-18 12:35:42 -08:00
parent 7968a7a3ca
commit e86d8e7a9c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
devstack-vm-gate.sh
View File

@@ -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"