From 916f01ef7d49234f2d537a1cc8a9b6b563bdac18 Mon Sep 17 00:00:00 2001 From: Andrew Laski Date: Tue, 21 Jun 2016 14:57:14 -0400 Subject: [PATCH] Bump service version for BuildRequest deletion This service version indicates that the successful delete of a BuildRequest during instance deletion will cause nova-conductor to stop a build when it notices that the BuildRequest is gone. This simplifies the delete code for dealing with pre-scheduled instances. Change-Id: I961d002cccd3e01a26cb5174e0804db7fc1f836d --- doc/notification_samples/service-update.json | 2 +- nova/objects/service.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/notification_samples/service-update.json b/doc/notification_samples/service-update.json index ede9a6068b70..1baf63a237d9 100644 --- a/doc/notification_samples/service-update.json +++ b/doc/notification_samples/service-update.json @@ -13,7 +13,7 @@ "disabled_reason": null, "report_count": 1, "forced_down": false, - "version": 14 + "version": 15 } }, "event_type": "service.update", diff --git a/nova/objects/service.py b/nova/objects/service.py index 4ea69d2814d0..a3d998b808bc 100644 --- a/nova/objects/service.py +++ b/nova/objects/service.py @@ -30,7 +30,7 @@ LOG = logging.getLogger(__name__) # NOTE(danms): This is the global service version counter -SERVICE_VERSION = 14 +SERVICE_VERSION = 15 # NOTE(danms): This is our SERVICE_VERSION history. The idea is that any @@ -89,6 +89,9 @@ SERVICE_VERSION_HISTORY = ( {'compute_rpc': '4.13'}, # Version 14: The compute manager supports setting device tags. {'compute_rpc': '4.13'}, + # Version 15: Indicate that nova-conductor will stop a boot if BuildRequest + # is deleted before RPC to nova-compute. + {'compute_rpc': '4.13'}, )