diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-01 19:56:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-01 19:56:23 +0000 |
| commit | ec678ff25332a2441cd3e2330b1a07b5316ead10 (patch) | |
| tree | 750b8be13e4d2a6636f82751756e4eb299de5561 /ci | |
| parent | 1de7c229eae2c0427da9bf58f5ac0d38c23addcc (diff) | |
| parent | dbee500d47cc79af6e4c740acf8d4aa5d23eab89 (diff) | |
Merge "scenario001/pingtest: remove gnocchi_res_alarm"
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/pingtests/scenario001-multinode.yaml | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/ci/pingtests/scenario001-multinode.yaml b/ci/pingtests/scenario001-multinode.yaml index 9dcbd390..7374846f 100644 --- a/ci/pingtests/scenario001-multinode.yaml +++ b/ci/pingtests/scenario001-multinode.yaml @@ -118,19 +118,21 @@ resources: ram: 512 vcpus: 1 - 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 +# 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 asg: type: OS::Heat::AutoScalingGroup |