From 55707079af9e711ac226dc1e47754f008ee40868 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Wed, 22 Feb 2012 10:18:31 -0600
Subject: [PATCH] Fix nova.conf paths

https://review.openstack.org/4227 missed a couple of paths to nova.conf
that need to be corrected.

Fixes bug 938692

Change-Id: I083baacc18792088a2a3ab032768c895a4feae76
---
 stack.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stack.sh b/stack.sh
index 6da985dacc..89ea76e8c1 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1115,7 +1115,7 @@ rm -f $NOVA_CONF/nova.conf
 add_nova_flag "--verbose"
 add_nova_flag "--allow_admin_api"
 add_nova_flag "--scheduler_driver=$SCHEDULER"
-add_nova_flag "--dhcpbridge_flagfile=$NOVA_DIR/bin/nova.conf"
+add_nova_flag "--dhcpbridge_flagfile=$NOVA_CONF/nova.conf"
 add_nova_flag "--fixed_range=$FIXED_RANGE"
 if is_service_enabled n-obj; then
     add_nova_flag "--s3_host=$SERVICE_HOST"
@@ -1426,10 +1426,10 @@ screen_it n-vol "cd $NOVA_DIR && $NOVA_DIR/bin/nova-volume"
 screen_it n-net "cd $NOVA_DIR && $NOVA_DIR/bin/nova-network"
 screen_it n-sch "cd $NOVA_DIR && $NOVA_DIR/bin/nova-scheduler"
 if is_service_enabled n-novnc; then
-    screen_it n-novnc "cd $NOVNC_DIR && ./utils/nova-novncproxy --flagfile $NOVA_DIR/bin/nova.conf --web ."
+    screen_it n-novnc "cd $NOVNC_DIR && ./utils/nova-novncproxy --flagfile $NOVA_CONF/nova.conf --web ."
 fi
 if is_service_enabled n-xvnc; then
-    screen_it n-xvnc "cd $NOVA_DIR && ./bin/nova-xvpvncproxy --flagfile $NOVA_DIR/bin/nova.conf"
+    screen_it n-xvnc "cd $NOVA_DIR && ./bin/nova-xvpvncproxy --flagfile $NOVA_CONF/nova.conf"
 fi
 if is_service_enabled n-cauth; then
     screen_it n-cauth "cd $NOVA_DIR && ./bin/nova-consoleauth"