X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fpingtests%2Fscenario001-multinode.yaml;h=141a389dda556453791e9cba836d4c6dd990d084;hb=36e6a0c693ce80b424adc3ebfc1b94f7f8a8a446;hp=2651c0d079fb44dad5efbea45922135b538feed7;hpb=ac55c423ad970ec21daad7a97eeacca8bfba6b6c;p=apex-tripleo-heat-templates.git

diff --git a/ci/pingtests/scenario001-multinode.yaml b/ci/pingtests/scenario001-multinode.yaml
index 2651c0d0..141a389d 100644
--- a/ci/pingtests/scenario001-multinode.yaml
+++ b/ci/pingtests/scenario001-multinode.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   HOT template to created resources deployed by scenario001.
@@ -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