From 3cf1ffbcdda2f74a7f0d57eb2b8bac8d90af108f Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Tue, 2 Oct 2012 11:51:27 -0500
Subject: [PATCH] Fix NOVA_CONF usage

NOVA_CONF now includes NOVA_CONF_DIR, fix remaining usage in lib/nova

Change-Id: I750d6e3ad73bed5c8a911f6dfe61770bbc804704
---
 lib/ceilometer | 2 +-
 lib/nova       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/ceilometer b/lib/ceilometer
index 10ceb4571e..7154ccb43b 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -8,7 +8,7 @@
 # - functions
 # - OS_USERNAME, OS_PASSWORD, OS_TENANT_NAME, OS_AUTH_URL set for admin credentials
 # - DEST set to the destination directory
-# - NOVA_CONF_DIR, NOVA_CONF set to the nova configuration directory & file
+# - NOVA_CONF set to the nova configuration file
 
 # stack.sh
 # ---------
diff --git a/lib/nova b/lib/nova
index 8308f05b62..333695ea3e 100644
--- a/lib/nova
+++ b/lib/nova
@@ -280,7 +280,7 @@ function init_nova() {
     rm -f $NOVA_DIR/bin/nova.conf
 
     # (Re)create ``nova.conf``
-    rm -f $NOVA_CONF_DIR/$NOVA_CONF
+    rm -f $NOVA_CONF
     add_nova_opt "[DEFAULT]"
     add_nova_opt "verbose=True"
     add_nova_opt "auth_strategy=keystone"
@@ -288,7 +288,7 @@ function init_nova() {
     add_nova_opt "api_paste_config=$NOVA_API_PASTE_INI"
     add_nova_opt "rootwrap_config=$NOVA_CONF_DIR/rootwrap.conf"
     add_nova_opt "compute_scheduler_driver=$SCHEDULER"
-    add_nova_opt "dhcpbridge_flagfile=$NOVA_CONF_DIR/$NOVA_CONF"
+    add_nova_opt "dhcpbridge_flagfile=$NOVA_CONF"
     add_nova_opt "force_dhcp_release=True"
     add_nova_opt "fixed_range=$FIXED_RANGE"
     add_nova_opt "s3_host=$SERVICE_HOST"
@@ -416,8 +416,8 @@ function start_nova() {
     screen_it n-crt "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-cert"
     screen_it n-net "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-network"
     screen_it n-sch "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-scheduler"
-    screen_it n-novnc "cd $NOVNC_DIR && ./utils/nova-novncproxy --config-file $NOVA_CONF_DIR/$NOVA_CONF --web ."
-    screen_it n-xvnc "cd $NOVA_DIR && ./bin/nova-xvpvncproxy --config-file $NOVA_CONF_DIR/$NOVA_CONF"
+    screen_it n-novnc "cd $NOVNC_DIR && ./utils/nova-novncproxy --config-file $NOVA_CONF --web ."
+    screen_it n-xvnc "cd $NOVA_DIR && ./bin/nova-xvpvncproxy --config-file $NOVA_CONF"
     screen_it n-cauth "cd $NOVA_DIR && ./bin/nova-consoleauth"
 }