From c679ec55ee20405dc1ee3f765c66b52a7960a3f7 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Thu, 23 Apr 2015 08:40:19 -0400
Subject: [PATCH] fix neutron grenade due to kilo rename of lib/neutron

Now that we are upgrading from kilo -> liberty, we need to reference
the correct filename in the shutdown portion.

Also fix import order so that we pick up TARGET devstack dir
early. There is I think *a lot* of this file that can actually be
deleted, but that's for another day.

Depends-On: I02a7af995dc7de857c4efcf2cef2f95d357c007a

Change-Id: Ib14321fc59969e720db289c44ca297dd88a94146
---
 projects/50_neutron/shutdown.sh |  2 +-
 projects/50_neutron/upgrade.sh  | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/projects/50_neutron/shutdown.sh b/projects/50_neutron/shutdown.sh
index be37eb7c..5eeab752 100755
--- a/projects/50_neutron/shutdown.sh
+++ b/projects/50_neutron/shutdown.sh
@@ -11,7 +11,7 @@ source $GRENADE_DIR/functions
 source $BASE_DEVSTACK_DIR/functions
 source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
 source $BASE_DEVSTACK_DIR/lib/tls
-source $BASE_DEVSTACK_DIR/lib/neutron
+source $BASE_DEVSTACK_DIR/lib/neutron-legacy
 
 set -o xtrace
 
diff --git a/projects/50_neutron/upgrade.sh b/projects/50_neutron/upgrade.sh
index 1d9c071c..d47f8c6c 100755
--- a/projects/50_neutron/upgrade.sh
+++ b/projects/50_neutron/upgrade.sh
@@ -23,6 +23,9 @@ trap cleanup SIGHUP SIGINT SIGTERM
 # Keep track of the grenade directory
 RUN_DIR=$(cd $(dirname "$0") && pwd)
 
+# Source params
+source $GRENADE_DIR/grenaderc
+
 # Import common functions
 source $GRENADE_DIR/functions
 
@@ -31,8 +34,6 @@ source $GRENADE_DIR/functions
 # and ``DISTRO``
 GetDistro
 
-# Source params
-source $GRENADE_DIR/grenaderc
 
 # This script exits on an error so that errors don't compound and you see
 # only the first error that occured.
@@ -78,12 +79,6 @@ SYSLOG=`trueorfalse False $SYSLOG`
 SYSLOG_HOST=${SYSLOG_HOST:-$HOST_IP}
 SYSLOG_PORT=${SYSLOG_PORT:-516}
 
-TOP_DIR=$BASE_DEVSTACK_DIR
-source $BASE_DEVSTACK_DIR/lib/neutron
-
-# Save current config files for posterity
-[[ -d $SAVE_DIR/etc.neutron ]] || cp -pr $NEUTRON_CONF_DIR $SAVE_DIR/etc.neutron
-
 # Set for DevStack compatibility
 TOP_DIR=$TARGET_DEVSTACK_DIR