openstack
/
ceilometer
Code Issues Proposed changes

Merge "tempest: Allow to configure tempest config"

This commit is contained in:
Zuul 2019-04-25 04:02:24 +00:00 committed by Gerrit Code Review
parent a626f315f1 56fd8168d2
commit 3a40ddc0c8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@ -383,9 +383,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

3
devstack/settings
View File

@ -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}