From 036b9cb519692173d8ae7ece4b02d0bd024282d2 Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Mon, 18 Feb 2019 18:17:05 +0100 Subject: [PATCH] Use new default persister configuration file The default configuration file name for monasca-persister has been changed to monasca-persister.conf. This change updates DevStack plugin to use the default. Change-Id: I95039356c768173fd902e7e253e1fad77c8a0b87 Story: 2004867 Task: 29112 --- devstack/lib/persister.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devstack/lib/persister.sh b/devstack/lib/persister.sh index 405ed1d6e..2233b7afc 100644 --- a/devstack/lib/persister.sh +++ b/devstack/lib/persister.sh @@ -31,7 +31,7 @@ if [ "$MONASCA_PERSISTER_IMPLEMENTATION_LANG" == "python" ]; then else MONASCA_PERSISTER_BIN_DIR=$(get_python_exec_prefix) fi - MONASCA_PERSISTER_CONF=${MONASCA_PERSISTER_CONF:-$MONASCA_PERSISTER_CONF_DIR/persister.conf} + MONASCA_PERSISTER_CONF=${MONASCA_PERSISTER_CONF:-$MONASCA_PERSISTER_CONF_DIR/monasca-persister.conf} MONASCA_PERSISTER_LOGGING_CONF=${MONASCA_PERSISTER_LOGGING_CONF:-$MONASCA_PERSISTER_CONF_DIR/persister-logging.conf} M_REPO_DRIVER_BASE=monasca_persister.repositories.${MONASCA_METRICS_DB}.metrics_repository @@ -158,9 +158,9 @@ configure_monasca_persister_python() { $MONASCA_PERSISTER_BIN_DIR/oslo-config-generator \ --config-file $MONASCA_PERSISTER_DIR/config-generator/persister.conf \ - --output-file /tmp/persister.conf + --output-file /tmp/monasca-persister.conf - install -m 600 /tmp/persister.conf ${MONASCA_PERSISTER_CONF} && rm -rf /tmp/persister.conf + install -m 600 /tmp/monasca-persister.conf ${MONASCA_PERSISTER_CONF} && rm -rf /tmp/monasca-persister.conf # Set up logging iniset $MONASCA_PERSISTER_CONF DEFAULT use_syslog $SYSLOG