Merge "Revert "Set cinder coordination backend url""

This commit is contained in:
Jenkins 2016-12-01 16:16:54 +00:00 committed by Gerrit Code Review
commit 38fb14591a

View File

@ -373,13 +373,6 @@ function configure_cinder {
iniset $CINDER_CONF DEFAULT os_privileged_user_password "$SERVICE_PASSWORD"
iniset $CINDER_CONF DEFAULT os_privileged_user_tenant "$SERVICE_PROJECT_NAME"
iniset $CINDER_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT"
# Set the backend url according to the configured dlm backend
if is_dlm_enabled; then
if [[ "$(dlm_backend)" == "zookeeper" ]]; then
iniset $CINDER_CONF coordination backend_url "zake://"
fi
fi
}
# create_cinder_accounts() - Set up common required cinder accounts