diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-21 15:14:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-21 15:14:57 +0000 |
| commit | 8514fb649ab008bd8cf2da05ce6b44542a3aedae (patch) | |
| tree | 9743738dfcf4f58688f696fdd9b5aa49ece96a0e /ci/pingtests | |
| parent | 85b2282336171139998a55979a1506f29cc08dbe (diff) | |
| parent | 152df0164f67ea5ff4488185c4f72a9a8be07669 (diff) | |
Merge "scenario001/pingtest: enable Gnocchi resource again"
Diffstat (limited to 'ci/pingtests')
| -rw-r--r-- | ci/pingtests/scenario001-multinode.yaml | 28 |
1 files changed, 13 insertions, 15 deletions
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 |