Merge "grenade: Fix detection of ceilometer-upgrade"
This commit is contained in:
commit
3ad5960780
@ -60,7 +60,7 @@ upgrade_project ceilometer $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANC
|
|||||||
# Migrate the database
|
# Migrate the database
|
||||||
# NOTE(chdent): As we evolve BIN_DIR is likely to be defined, but
|
# NOTE(chdent): As we evolve BIN_DIR is likely to be defined, but
|
||||||
# currently it is not.
|
# currently it is not.
|
||||||
CEILOMETER_BIN_DIR=$(dirname $(which ceilometer-upgrade))
|
CEILOMETER_BIN_DIR=$(get_python_exec_prefix)
|
||||||
$CEILOMETER_BIN_DIR/ceilometer-upgrade --skip-gnocchi-resource-types || die $LINENO "ceilometer-upgrade error"
|
$CEILOMETER_BIN_DIR/ceilometer-upgrade --skip-gnocchi-resource-types || die $LINENO "ceilometer-upgrade error"
|
||||||
|
|
||||||
# Start Ceilometer
|
# Start Ceilometer
|
||||||
|
Loading…
Reference in New Issue
Block a user