aboutsummaryrefslogtreecommitdiffstats
path: root/ci/pingtests
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-03-07 16:38:36 -0500
committerEmilien Macchi <emilien@redhat.com>2017-04-18 13:36:24 +0000
commit152df0164f67ea5ff4488185c4f72a9a8be07669 (patch)
treec68cdbc2c6ddd5497379af7c0f62d19973629ab4 /ci/pingtests
parent487dbe3107d940196ea08304034c124de0866e5f (diff)
scenario001/pingtest: enable Gnocchi resource again
We disabled it because it stopped working. Let's see how it works now. Change-Id: If1efb86cb1d6ada357d4562408a566ac702fb6be Closes-Bug: #1646506
Diffstat (limited to 'ci/pingtests')
-rw-r--r--ci/pingtests/scenario001-multinode.yaml28
1 files changed, 13 insertions, 15 deletions
diff --git a/ci/pingtests/scenario001-multinode.yaml b/ci/pingtests/scenario001-multinode.yaml
index 2651c0d..af8f47a 100644
--- a/ci/pingtests/scenario001-multinode.yaml
+++ b/ci/pingtests/scenario001-multinode.yaml
@@ -128,21 +128,19 @@ resources:
ram: 512
vcpus: 1
-# Disabling this resource now
-# https://bugs.launchpad.net/tripleo/+bug/1646506
-# gnocchi_res_alarm:
-# type: OS::Aodh::GnocchiResourcesAlarm
-# properties:
-# description: Do stuff with gnocchi
-# metric: cpu_util
-# aggregation_method: mean
-# granularity: 60
-# evaluation_periods: 1
-# threshold: 50
-# alarm_actions: []
-# resource_type: instance
-# resource_id: { get_resource: server1 }
-# comparison_operator: gt
+ gnocchi_res_alarm:
+ type: OS::Aodh::GnocchiResourcesAlarm
+ properties:
+ description: Do stuff with gnocchi
+ metric: cpu_util
+ aggregation_method: mean
+ granularity: 60
+ evaluation_periods: 1
+ threshold: 50
+ alarm_actions: []
+ resource_type: instance
+ resource_id: { get_resource: server1 }
+ comparison_operator: gt
asg:
type: OS::Heat::AutoScalingGroup