Merge "scenario001/pingtest: remove gnocchi_res_alarm"

This commit is contained in:
Jenkins 2016-12-01 19:56:23 +00:00 committed by Gerrit Code Review
commit ec678ff253

View File

@ -118,19 +118,21 @@ resources:
ram: 512 ram: 512
vcpus: 1 vcpus: 1
gnocchi_res_alarm: # Disabling this resource now
type: OS::Aodh::GnocchiResourcesAlarm # https://bugs.launchpad.net/tripleo/+bug/1646506
properties: # gnocchi_res_alarm:
description: Do stuff with gnocchi # type: OS::Aodh::GnocchiResourcesAlarm
metric: cpu_util # properties:
aggregation_method: mean # description: Do stuff with gnocchi
granularity: 60 # metric: cpu_util
evaluation_periods: 1 # aggregation_method: mean
threshold: 50 # granularity: 60
alarm_actions: [] # evaluation_periods: 1
resource_type: instance # threshold: 50
resource_id: { get_resource: server1 } # alarm_actions: []
comparison_operator: gt # resource_type: instance
# resource_id: { get_resource: server1 }
# comparison_operator: gt
asg: asg:
type: OS::Heat::AutoScalingGroup type: OS::Heat::AutoScalingGroup