diff options
author | zhurong <aaronzhu1121@gmail.com> | 2019-04-19 13:31:05 +0800 |
---|---|---|
committer | zhurong <aaronzhu1121@gmail.com> | 2019-04-25 11:19:24 +0800 |
commit | 86aa9f419791ef8b886af250325509bddac70008 (patch) | |
tree | dbd69e639b785ed9bbe4183a7ab7aedeb78e7482 | |
parent | 98ea125e2268f84565e2b897b3fddb9a21bc45be (diff) | |
download | ceilometer-86aa9f419791ef8b886af250325509bddac70008.tar.gz |
tempest: Allow to configure tempest config
Change-Id: Ied0822ee1031c399c7aa86482e8f570c48c3935e
-rw-r--r-- | devstack/plugin.sh | 6 | ||||
-rw-r--r-- | devstack/settings | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 268f18da..af0feeb8 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -405,9 +405,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 10000000000 - 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} |