diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 68036c612b..07b7681182 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -252,23 +252,9 @@ function configure_manila { iniset $MANILA_CONF DEFAULT osapi_share_listen_port $MANILA_SERVICE_PORT_INT fi - if [ "$SYSLOG" != "False" ]; then - iniset $MANILA_CONF DEFAULT use_syslog True - fi - iniset_rpc_backend manila $MANILA_CONF DEFAULT - if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then - # Add color to logging output - iniset $MANILA_CONF DEFAULT logging_context_format_string \ - "%(asctime)s.%(msecs)d %(color)s%(levelname)s %(name)s [%(request_id)s %(user_id)s %(project_id)s%(color)s] %(instance)s%(color)s%(message)s" - iniset $MANILA_CONF DEFAULT logging_default_format_string \ - "%(asctime)s.%(msecs)d %(color)s%(levelname)s %(name)s [-%(color)s] %(instance)s%(color)s%(message)s" - iniset $MANILA_CONF DEFAULT logging_debug_format_suffix \ - "from (pid=%(process)d) %(funcName)s %(pathname)s:%(lineno)d" - iniset $MANILA_CONF DEFAULT logging_exception_prefix \ - "%(color)s%(asctime)s.%(msecs)d TRACE %(name)s %(instance)s" - fi + setup_logging $MANILA_CONF MANILA_CONFIGURE_GROUPS=${MANILA_CONFIGURE_GROUPS:-"$MANILA_ENABLED_BACKENDS"} set_config_opts $MANILA_CONFIGURE_GROUPS