openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "scenario001/pingtest: enable Gnocchi resource again"

This commit is contained in:
Jenkins 2017-04-21 15:14:57 +00:00 committed by Gerrit Code Review
parent 85b2282336 152df0164f
commit 8514fb649a
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ci/pingtests/scenario001-multinode.yaml
View File

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