diff options
| author | Mehdi Abaakouk <sileht@redhat.com> | 2017-04-25 14:31:00 +0200 |
|---|---|---|
| committer | Mehdi Abaakouk <sileht@redhat.com> | 2017-05-02 19:23:50 +0200 |
| commit | 3aaba70c3ac6b57a6e0c1854fd223111c6d5f1ec (patch) | |
| tree | c6c8a93f3545f43cfa749f2b7c4b326f2f892999 /devstack | |
| parent | 27ac71bc5257f9eb453ff7fd5e903afe374cd04f (diff) | |
| download | ceilometer-3aaba70c3ac6b57a6e0c1854fd223111c6d5f1ec.tar.gz | |
tempest: Allow to configure granularity
Change-Id: I31344a9f8938ae9c7875cad76430508dd9fd4539
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/plugin.sh | 2 | ||||
| -rw-r--r-- | devstack/settings | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index dc020902..8d4d9401 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -476,6 +476,8 @@ if is_service_enabled ceilometer; then init_ceilometer # Start the services start_ceilometer + elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then + iniset $TEMPEST_CONFIG telemetry alarm_granularity $CEILOMETER_ALARM_GRANULARITY fi if [[ "$1" == "unstack" ]]; then diff --git a/devstack/settings b/devstack/settings index f82513f2..b7299e2d 100644 --- a/devstack/settings +++ b/devstack/settings @@ -19,6 +19,9 @@ fi # Gnocchi default archive_policy for Ceilometer GNOCCHI_ARCHIVE_POLICY=${GNOCCHI_ARCHIVE_POLICY:-low} +# 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 connection info. CEILOMETER_SERVICE_PROTOCOL=http |