From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 7 Mar 2017 21:38:36 +0000 (-0500)
Subject: scenario001/pingtest: enable Gnocchi resource again
X-Git-Tag: opnfv-6.0.0~746^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=152df0164f67ea5ff4488185c4f72a9a8be07669;p=apex-tripleo-heat-templates.git

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
---

diff --git a/ci/pingtests/scenario001-multinode.yaml b/ci/pingtests/scenario001-multinode.yaml
index 2651c0d0..af8f47aa 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