Browse code

Merge "Add NOVA_NOTIFICATION_FORMAT variable"

Zuul authored on 2019/06/15 19:03:05
Showing 1 changed files
... ...
@@ -150,6 +150,10 @@ NOVA_ALLOW_MOVE_TO_SAME_HOST=$(trueorfalse True NOVA_ALLOW_MOVE_TO_SAME_HOST)
150 150
 ISCSID_DEBUG=$(trueorfalse False ISCSID_DEBUG)
151 151
 ISCSID_DEBUG_LEVEL=${ISCSID_DEBUG_LEVEL:-4}
152 152
 
153
+# Format for notifications. Nova defaults to "unversioned" since Train.
154
+# Other options include "versioned" and "both".
155
+NOVA_NOTIFICATION_FORMAT=${NOVA_NOTIFICATION_FORMAT:-unversioned}
156
+
153 157
 # Functions
154 158
 # ---------
155 159
 
... ...
@@ -487,6 +491,7 @@ function create_nova_conf {
487 487
     # enable notifications, but it will allow them to function when enabled.
488 488
     iniset $NOVA_CONF oslo_messaging_notifications driver "messagingv2"
489 489
     iniset $NOVA_CONF oslo_messaging_notifications transport_url $(get_notification_url)
490
+    iniset $NOVA_CONF notifications notification_format "$NOVA_NOTIFICATION_FORMAT"
490 491
     iniset_rpc_backend nova $NOVA_CONF
491 492
 
492 493
     iniset $NOVA_CONF DEFAULT osapi_compute_workers "$API_WORKERS"