diff options
| author | Zuul <zuul@review.opendev.org> | 2019-04-25 06:03:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-04-25 06:03:02 +0000 |
| commit | d593c3d7883beb3a57f51d7ad60e630e96f1bff9 (patch) | |
| tree | 555fcaa999aadebf1eedcb79379320c40713fc5a | |
| parent | 27eb3f431e177054789ef47859517d10862bc902 (diff) | |
| parent | 86aa9f419791ef8b886af250325509bddac70008 (diff) | |
| download | ceilometer-d593c3d7883beb3a57f51d7ad60e630e96f1bff9.tar.gz | |
Merge "tempest: Allow to configure tempest config" into stable/stein
| -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 249dfa44..142ecf7b 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} |