From 3aaba70c3ac6b57a6e0c1854fd223111c6d5f1ec Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <sileht@redhat.com>
Date: Tue, 25 Apr 2017 14:31:00 +0200
Subject: tempest: Allow to configure granularity

Change-Id: I31344a9f8938ae9c7875cad76430508dd9fd4539
---
 devstack/plugin.sh | 2 ++
 devstack/settings  | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'devstack')

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
-- 
cgit v1.2.1