Merge "Allow passing extra parameters to keystone-manage in extend_start"

1 files changed, 5 insertions, 4 deletions

diff --git a/docker/keystone/keystone/extend_start.sh b/docker/keystone/keystone/extend_start.sh
index cd8a75635..8802dd9d5 100644
--- a/docker/keystone/keystone/extend_start.sh
+++ b/docker/keystone/keystone/extend_start.sh
@@ -39,14 +39,15 @@ if [[ $(stat -c %a ${KEYSTONE_LOG_DIR}) != "755" ]]; then
     chmod 755 ${KEYSTONE_LOG_DIR}
 fi
 
+EXTRA_KEYSTONE_MANAGE_ARGS=${EXTRA_KEYSTONE_MANAGE_ARGS-}
 # Upgrade and exit if KOLLA_UPGRADE variable is set. This catches all cases
 # of the KOLLA_UPGRADE variable being set, including empty.
 if [[ "${!KOLLA_UPGRADE[@]}" ]]; then
     # TODO(duonghq): check doctor result here
     # TODO: find reason why doctor failed in gate
     # sudo -H -u keystone keystone-manage doctor
-    sudo -H -u keystone keystone-manage db_sync --expand
-    sudo -H -u keystone keystone-manage db_sync --migrate
+    sudo -H -u keystone keystone-manage ${EXTRA_KEYSTONE_MANAGE_ARGS} db_sync --expand
+    sudo -H -u keystone keystone-manage ${EXTRA_KEYSTONE_MANAGE_ARGS} db_sync --migrate
     exit 0
 fi
 
@@ -54,14 +55,14 @@ fi
 # This catches all cases of the KOLLA_FINISH_UPGRADE variable being set,
 # including empty.
 if [[ "${!KOLLA_FINISH_UPGRADE[@]}" ]]; then
-    sudo -H -u keystone keystone-manage db_sync --contract
+    sudo -H -u keystone keystone-manage ${EXTRA_KEYSTONE_MANAGE_ARGS} db_sync --contract
     exit 0
 fi
 
 # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
 # of the KOLLA_BOOTSTRAP variable being set, including empty.
 if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    sudo -H -u keystone keystone-manage db_sync
+    sudo -H -u keystone keystone-manage ${EXTRA_KEYSTONE_MANAGE_ARGS} db_sync
     exit 0
 fi