From 56fd8168d236f504358558fa45fd9ad68f3ffe52 Mon Sep 17 00:00:00 2001 From: zhurong Date: Fri, 19 Apr 2019 13:31:05 +0800 Subject: tempest: Allow to configure tempest config Change-Id: Ied0822ee1031c399c7aa86482e8f570c48c3935e --- devstack/plugin.sh | 6 +++--- devstack/settings | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'devstack') diff --git a/devstack/plugin.sh b/devstack/plugin.sh index d2b03548..3d8bdc3d 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -404,9 +404,9 @@ if is_service_enabled ceilometer; then start_ceilometer elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then iniset $TEMPEST_CONFIG telemetry alarm_granularity $CEILOMETER_ALARM_GRANULARITY - iniset $TEMPEST_CONFIG telemetry alarm_threshold 10000000 - iniset $TEMPEST_CONFIG telemetry alarm_metric_name cpu - iniset $TEMPEST_CONFIG telemetry alarm_aggregation_method rate:mean + iniset $TEMPEST_CONFIG telemetry alarm_threshold $CEILOMETER_ALARM_THRESHOLD + iniset $TEMPEST_CONFIG telemetry alarm_metric_name $CEILOMETER_ALARM_METRIC_NAME + iniset $TEMPEST_CONFIG telemetry alarm_aggregation_method $CEILOMETER_ALARM_AGGREGATION_METHOD fi if [[ "$1" == "unstack" ]]; then diff --git a/devstack/settings b/devstack/settings index 22da068e..f1dd2379 100644 --- a/devstack/settings +++ b/devstack/settings @@ -38,6 +38,9 @@ GNOCCHI_WSGI_DIR=${GNOCCHI_WSGI_DIR:-/var/www/gnocchi} # FIXME(sileht): put 300 by default to match the archive policy # when the gate job have overrided this. CEILOMETER_ALARM_GRANULARITY=${CEILOMETER_ALARM_GRANULARITY:-60} +CEILOMETER_ALARM_AGGREGATION_METHOD=${CEILOMETER_ALARM_AGGREGATION_METHOD:-rate:mean} +CEILOMETER_ALARM_METRIC_NAME=${CEILOMETER_ALARM_METRIC_NAME:-cpu} +CEILOMETER_ALARM_THRESHOLD=${CEILOMETER_ALARM_THRESHOLD:-10000000} # To enable OSprofiler change value of this variable to "notifications,profiler" CEILOMETER_NOTIFICATION_TOPICS=${CEILOMETER_NOTIFICATION_TOPICS:-notifications} -- cgit v1.2.1