From ffde3507fa864b11010ac7af3305463d91bb96b5 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 23 Nov 2024 19:44:28 +0900 Subject: [PATCH] grenade: Fix missing zaqar-sql-db-manage We have to set the appropriate prefix according to the installation destination. Change-Id: If7b6c37120280264629cc5d0723508a610d4b5ca --- devstack/plugin.sh | 5 ++--- devstack/upgrade/upgrade.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 3a3bac32f..35d8d420a 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -29,7 +29,6 @@ XTRACE=$(set +o | grep xtrace) set +o xtrace - # Functions # --------- @@ -122,7 +121,7 @@ function configure_zaqar { iniset $ZAQAR_CONF 'drivers:management_store:sqlalchemy' uri `database_connection_url zaqar` iniset $ZAQAR_CONF 'drivers:management_store:sqlalchemy' database zaqar_mgmt - zaqar-sql-db-manage --config-file $ZAQAR_CONF upgrade head + $ZAQAR_BIN_DIR/zaqar-sql-db-manage --config-file $ZAQAR_CONF upgrade head iniset $ZAQAR_CONF drivers message_store redis iniset $ZAQAR_CONF 'drivers:message_store:redis' uri redis://localhost:6379 @@ -134,7 +133,7 @@ function configure_zaqar { iniset $ZAQAR_CONF 'drivers:management_store:sqlalchemy' uri `database_connection_url zaqar` iniset $ZAQAR_CONF 'drivers:management_store:sqlalchemy' database zaqar_mgmt - zaqar-sql-db-manage --config-file $ZAQAR_CONF upgrade head + $ZAQAR_BIN_DIR/zaqar-sql-db-manage --config-file $ZAQAR_CONF upgrade head iniset $ZAQAR_CONF drivers message_store swift iniset $ZAQAR_CONF 'drivers:message_store:swift' auth_url $KEYSTONE_AUTH_URI diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh index af93b242f..39b2eaa3b 100755 --- a/devstack/upgrade/upgrade.sh +++ b/devstack/upgrade/upgrade.sh @@ -84,7 +84,7 @@ function wait_for_keystone { stack_install_service zaqar if grep -q 'management_store *= *sqlalchemy' /etc/zaqar/zaqar.conf; then - zaqar-sql-db-manage --config-file $ZAQAR_CONF upgrade head || die $LINENO "DB sync error" + $ZAQAR_BIN_DIR/zaqar-sql-db-manage --config-file $ZAQAR_CONF upgrade head || die $LINENO "DB sync error" fi # calls upgrade-zaqar for specific release