Merge "Fix devstack runprocess for cloudkitty api"
This commit is contained in:
commit
9ca4a42189
|
@ -279,7 +279,7 @@ function init_cloudkitty {
|
||||||
create_opensearch_index
|
create_opensearch_index
|
||||||
|
|
||||||
# Migrate cloudkitty database
|
# Migrate cloudkitty database
|
||||||
$CLOUDKITTY_BIN_DIR/cloudkitty-dbsync upgrade
|
upgrade_cloudkitty_database
|
||||||
|
|
||||||
# Init the storage backend
|
# Init the storage backend
|
||||||
if [ $CLOUDKITTY_STORAGE_BACKEND == 'hybrid' ]; then
|
if [ $CLOUDKITTY_STORAGE_BACKEND == 'hybrid' ]; then
|
||||||
|
@ -381,7 +381,7 @@ function install_cloudkitty {
|
||||||
function start_cloudkitty {
|
function start_cloudkitty {
|
||||||
run_process ck-proc "$CLOUDKITTY_BIN_DIR/cloudkitty-processor --config-file=$CLOUDKITTY_CONF"
|
run_process ck-proc "$CLOUDKITTY_BIN_DIR/cloudkitty-processor --config-file=$CLOUDKITTY_CONF"
|
||||||
if [[ "$CLOUDKITTY_USE_MOD_WSGI" == "False" ]]; then
|
if [[ "$CLOUDKITTY_USE_MOD_WSGI" == "False" ]]; then
|
||||||
run_process ck-api "$CLOUDKITTY_BIN_DIR/cloudkitty-api --config-file=$CLOUDKITTY_CONF"
|
run_process ck-api "$CLOUDKITTY_BIN_DIR/cloudkitty-api --host $CLOUDKITTY_SERVICE_HOST --port $CLOUDKITTY_SERVICE_PORT"
|
||||||
elif is_service_enabled ck-api; then
|
elif is_service_enabled ck-api; then
|
||||||
enable_apache_site cloudkitty
|
enable_apache_site cloudkitty
|
||||||
echo_summary "Waiting 15s for cloudkitty-processor to authenticate against keystone before apache is restarted."
|
echo_summary "Waiting 15s for cloudkitty-processor to authenticate against keystone before apache is restarted."
|
||||||
|
@ -443,6 +443,11 @@ function update_horizon_static {
|
||||||
restart_apache_server
|
restart_apache_server
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Upgrade cloudkitty database
|
||||||
|
function upgrade_cloudkitty_database {
|
||||||
|
$CLOUDKITTY_BIN_DIR/cloudkitty-dbsync upgrade
|
||||||
|
}
|
||||||
|
|
||||||
# configure_cloudkitty_dashboard() - Set config files, create data dirs, etc
|
# configure_cloudkitty_dashboard() - Set config files, create data dirs, etc
|
||||||
function configure_cloudkitty_dashboard {
|
function configure_cloudkitty_dashboard {
|
||||||
sudo ln -s $CLOUDKITTY_ENABLED_DIR/_[0-9]*.py \
|
sudo ln -s $CLOUDKITTY_ENABLED_DIR/_[0-9]*.py \
|
||||||
|
|
Loading…
Reference in New Issue