From 966a4dfa5f030d4b88e4902c9f762a2d6213a670 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Wed, 5 Jun 2019 09:33:11 -0400 Subject: [PATCH] Configure nova notification format in non-grenade CI jobs Nova used to emit versioned and unversioned notiifcations by default but that changed in https://review.opendev.org/603079/ so now nova emits only unversioned notifications by default. Watcher listens for versioned notifications so we need to configure nova to emit both versioned (for Watcher) and unversioned (for Ceilometer) notifications explicitly. This adds an override-defaults file so devstack will load up the nova devstack variable to set the notification_format before importing and stacking the nova lib script. Note that this only fixes the non-grenade CI jobs since grenade requires separate handling for overriding defaults which is proving hard to do and will be addressed in a separate change. Partial-Bug: #1831917 Change-Id: I7e441608b38338eecd80e663ed3abe66a89e504f --- devstack/local.conf.compute | 6 ++++++ devstack/local.conf.controller | 6 ++++++ devstack/override-defaults | 9 +++++++++ 3 files changed, 21 insertions(+) create mode 100644 devstack/override-defaults diff --git a/devstack/local.conf.compute b/devstack/local.conf.compute index 24ec44b28..c7fb54279 100644 --- a/devstack/local.conf.compute +++ b/devstack/local.conf.compute @@ -45,3 +45,9 @@ LOGDAYS=2 [[post-config|$NOVA_CONF]] [DEFAULT] compute_monitors=cpu.virt_driver +[notifications] +# Enable both versioned and unversioned notifications. Watcher only +# uses versioned notifications but ceilometer uses unversioned. We +# can change this to just versioned when ceilometer handles versioned +# notifications from nova: https://bugs.launchpad.net/ceilometer/+bug/1665449 +notification_format=both diff --git a/devstack/local.conf.controller b/devstack/local.conf.controller index 51ac5c396..eb46f63d0 100644 --- a/devstack/local.conf.controller +++ b/devstack/local.conf.controller @@ -49,3 +49,9 @@ LOGDAYS=2 [[post-config|$NOVA_CONF]] [DEFAULT] compute_monitors=cpu.virt_driver +[notifications] +# Enable both versioned and unversioned notifications. Watcher only +# uses versioned notifications but ceilometer uses unversioned. We +# can change this to just versioned when ceilometer handles versioned +# notifications from nova: https://bugs.launchpad.net/ceilometer/+bug/1665449 +notification_format=both diff --git a/devstack/override-defaults b/devstack/override-defaults new file mode 100644 index 000000000..7ae8f38a6 --- /dev/null +++ b/devstack/override-defaults @@ -0,0 +1,9 @@ +# Plug-in overrides +# https://docs.openstack.org/devstack/latest/plugins.html#plugin-interface + +# Enable both versioned and unversioned notifications. Watcher only +# uses versioned notifications but ceilometer uses unversioned. We +# can change this to just versioned when ceilometer handles +# versioned notifications from nova: +# https://bugs.launchpad.net/ceilometer/+bug/1665449 +NOVA_NOTIFICATION_FORMAT=both \ No newline at end of file