diff --git a/projects/50_neutron/shutdown.sh b/projects/50_neutron/shutdown.sh index 90eae205..75866add 100755 --- a/projects/50_neutron/shutdown.sh +++ b/projects/50_neutron/shutdown.sh @@ -12,12 +12,7 @@ source $BASE_DEVSTACK_DIR/functions source $BASE_DEVSTACK_DIR/stackrc # needed for status directory source $BASE_DEVSTACK_DIR/lib/apache source $BASE_DEVSTACK_DIR/lib/tls -# TODO(sdague): remove this conditional once we've branched -# grenade. Right now we need to support stable/mitaka, stable/newton, -# and master devstack -if [[ -e $BASE_DEVSTACK_DIR/lib/neutron ]]; then - source $BASE_DEVSTACK_DIR/lib/neutron -fi +source $BASE_DEVSTACK_DIR/lib/neutron source $BASE_DEVSTACK_DIR/lib/neutron-legacy set -o xtrace