summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ceilometer/meter/notifications.py2
-rw-r--r--releasenotes/notes/lookup-meter-def-vol-correctly-0122ae429275f2a6.yaml8
2 files changed, 9 insertions, 1 deletions
diff --git a/ceilometer/meter/notifications.py b/ceilometer/meter/notifications.py
index dc360fb8..c2dd1b03 100644
--- a/ceilometer/meter/notifications.py
+++ b/ceilometer/meter/notifications.py
@@ -191,7 +191,7 @@ def load_definitions(config_def):
continue
try:
- if (event_def['volume'] != 1 or
+ if (event_def.get('volume') != 1 or
not cfg.CONF.notification.disable_non_metric_meters):
md = MeterDefinition(event_def)
meter_defs[event_def['name']] = md
diff --git a/releasenotes/notes/lookup-meter-def-vol-correctly-0122ae429275f2a6.yaml b/releasenotes/notes/lookup-meter-def-vol-correctly-0122ae429275f2a6.yaml
new file mode 100644
index 00000000..9bb5c5b1
--- /dev/null
+++ b/releasenotes/notes/lookup-meter-def-vol-correctly-0122ae429275f2a6.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+ - >
+ [`bug 1536699 <https://bugs.launchpad.net/ceilometer/+bug/1536699>`_]
+ Patch to fix volume field lookup in meter definition file. In case
+ the field is missing in the definition, it raises a keyerror and
+ aborts. Instead we should skip the missing field meter and continue
+ with the rest of the definitions.