diff options
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/plugin.sh | 3 | ||||
| -rw-r--r-- | devstack/settings | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 9031b258..1f07a83a 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -405,6 +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 fi if [[ "$1" == "unstack" ]]; then diff --git a/devstack/settings b/devstack/settings index 410ed8ea..22da068e 100644 --- a/devstack/settings +++ b/devstack/settings @@ -19,7 +19,11 @@ fi # Gnocchi default archive_policy for Ceilometer # TODO(sileht): when Gnocchi 4.0 is out use the tarball instead GNOCCHI_GIT_PATH=${GNOCCHI_GIT_PATH:-git+https://github.com/gnocchixyz/gnocchi#egg=gnocchi} -GNOCCHI_ARCHIVE_POLICY=${GNOCCHI_ARCHIVE_POLICY:-ceilometer-low} +if [ -n "$GNOCCHI_ARCHIVE_POLICY_TEMPEST" ]; then + GNOCCHI_ARCHIVE_POLICY=$GNOCCHI_ARCHIVE_POLICY_TEMPEST +else + GNOCCHI_ARCHIVE_POLICY=${GNOCCHI_ARCHIVE_POLICY:-ceilometer-low} +fi GNOCCHI_CONF_DIR=${GNOCCHI_CONF_DIR:-/etc/gnocchi} GNOCCHI_CONF=${GNOCCHI_CONF:-${GNOCCHI_CONF_DIR}/gnocchi.conf} GNOCCHI_COORDINATOR_URL=${CEILOMETER_COORDINATOR_URL:-redis://localhost:6379} |