Fix shutdown.sh & upgrade.sh for grenade

The shutdown.sh & upgrade.sh scripts were attempting to load a file
which no longer exists. Have them load the correct file.

Change-Id: I864023880062fde0e84df81b7c7a6a17c0b09428
This commit is contained in:
John L. Villalovos 2016-05-16 16:41:04 -07:00
parent 146f275b7b
commit ca611613a8
2 changed files with 10 additions and 2 deletions

View File

@ -11,7 +11,11 @@ source $GRENADE_DIR/functions
source $BASE_DEVSTACK_DIR/functions source $BASE_DEVSTACK_DIR/functions
source $BASE_DEVSTACK_DIR/stackrc # needed for status directory source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
source $BASE_DEVSTACK_DIR/lib/tls source $BASE_DEVSTACK_DIR/lib/tls
source $BASE_DEVSTACK_DIR/lib/ironic source $BASE_DEVSTACK_DIR/lib/apache
# Keep track of the DevStack directory
IRONIC_DEVSTACK_DIR=$(dirname "$0")/..
source $IRONIC_DEVSTACK_DIR/lib/ironic
set -o xtrace set -o xtrace

View File

@ -41,7 +41,11 @@ source $TARGET_DEVSTACK_DIR/stackrc
source $TARGET_DEVSTACK_DIR/lib/tls source $TARGET_DEVSTACK_DIR/lib/tls
source $TARGET_DEVSTACK_DIR/lib/nova source $TARGET_DEVSTACK_DIR/lib/nova
source $TARGET_DEVSTACK_DIR/lib/neutron-legacy source $TARGET_DEVSTACK_DIR/lib/neutron-legacy
source $TARGET_DEVSTACK_DIR/lib/ironic source $TARGET_DEVSTACK_DIR/lib/apache
# Keep track of the DevStack directory
IRONIC_DEVSTACK_DIR=$(dirname "$0")/..
source $IRONIC_DEVSTACK_DIR/lib/ironic
# Print the commands being run so that we can see the command that triggers # Print the commands being run so that we can see the command that triggers
# an error. It is also useful for following allowing as the install occurs. # an error. It is also useful for following allowing as the install occurs.