openstack/devstack
Code Issues Proposed changes

Merge "Don't run and check c-api if it is disabled"

Browse Source
This commit is contained in:
Jenkins
2017-06-05 20:22:10 +00:00
committed by Gerrit Code Review
parent e1a2448970 2dfca047d9
commit adabee29f6
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cinder
View File

@@ -498,6 +498,7 @@ function start_cinder {
fi fi
fi fi
if is_service_enabled c-api ; then
if [ "$CINDER_USE_MOD_WSGI" == "True" ]; then if [ "$CINDER_USE_MOD_WSGI" == "True" ]; then
enable_apache_site osapi-volume enable_apache_site osapi-volume
restart_apache_server restart_apache_server
@@ -511,6 +512,12 @@ function start_cinder {
die $LINENO "c-api did not start" die $LINENO "c-api did not start"
fi fi
# Start proxies if enabled
if is_service_enabled tls-proxy; then
start_tls_proxy cinder '*' $CINDER_SERVICE_PORT $CINDER_SERVICE_HOST $CINDER_SERVICE_PORT_INT
fi
fi
run_process c-sch "$CINDER_BIN_DIR/cinder-scheduler --config-file $CINDER_CONF" run_process c-sch "$CINDER_BIN_DIR/cinder-scheduler --config-file $CINDER_CONF"
run_process c-bak "$CINDER_BIN_DIR/cinder-backup --config-file $CINDER_CONF" run_process c-bak "$CINDER_BIN_DIR/cinder-backup --config-file $CINDER_CONF"
run_process c-vol "$CINDER_BIN_DIR/cinder-volume --config-file $CINDER_CONF" run_process c-vol "$CINDER_BIN_DIR/cinder-volume --config-file $CINDER_CONF"
@@ -518,11 +525,6 @@ function start_cinder {
# NOTE(jdg): For cinder, startup order matters. To ensure that repor_capabilities is received # NOTE(jdg): For cinder, startup order matters. To ensure that repor_capabilities is received
# by the scheduler start the cinder-volume service last (or restart it) after the scheduler # by the scheduler start the cinder-volume service last (or restart it) after the scheduler
# has started. This is a quick fix for lp bug/1189595 # has started. This is a quick fix for lp bug/1189595
# Start proxies if enabled
if is_service_enabled c-api && is_service_enabled tls-proxy; then
start_tls_proxy cinder '*' $CINDER_SERVICE_PORT $CINDER_SERVICE_HOST $CINDER_SERVICE_PORT_INT
fi
} }
# stop_cinder() - Stop running processes # stop_cinder() - Stop running processes