diff options
| author | Zuul <zuul@review.opendev.org> | 2019-04-29 02:58:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-04-29 02:58:53 +0000 |
| commit | 6d33fa50499f6109a8d356088f94f89cbb5d44cd (patch) | |
| tree | f0f297c013dfb163fcddfd1a019f20bce7f41ad9 | |
| parent | ac190d5087e17231cb388882e68029e17327deca (diff) | |
| parent | d2ee8f32ef67b448803784e90a24840a17f6a88d (diff) | |
| download | ceilometer-6d33fa50499f6109a8d356088f94f89cbb5d44cd.tar.gz | |
Merge "tempest: Allow to configure tempest config" into stable/rocky
| -rw-r--r-- | devstack/plugin.sh | 3 | ||||
| -rw-r--r-- | devstack/settings | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 0de48a9f..abdd3080 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -406,6 +406,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 $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 8c44be47..ba0b55ac 100644 --- a/devstack/settings +++ b/devstack/settings @@ -34,6 +34,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:-mean} +CEILOMETER_ALARM_METRIC_NAME=${CEILOMETER_ALARM_METRIC_NAME:-cpu_util} +CEILOMETER_ALARM_THRESHOLD=${CEILOMETER_ALARM_THRESHOLD:-10} # To enable OSprofiler change value of this variable to "notifications,profiler" CEILOMETER_NOTIFICATION_TOPICS=${CEILOMETER_NOTIFICATION_TOPICS:-notifications} |