summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorzhurong <aaronzhu1121@gmail.com>2019-04-19 13:31:05 +0800
committerzhurong <aaronzhu1121@gmail.com>2019-04-19 13:31:05 +0800
commit56fd8168d236f504358558fa45fd9ad68f3ffe52 (patch)
tree1581da77af1e0fb459612b989e561fd7436acd1c /devstack
parent2cc9bc7faaeefe88bb47afca5befe1347894e762 (diff)
downloadceilometer-56fd8168d236f504358558fa45fd9ad68f3ffe52.tar.gz
tempest: Allow to configure tempest config
Change-Id: Ied0822ee1031c399c7aa86482e8f570c48c3935e
Diffstat (limited to 'devstack')
-rw-r--r--devstack/plugin.sh6
-rw-r--r--devstack/settings3
2 files changed, 6 insertions, 3 deletions
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}