summaryrefslogtreecommitdiff
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-21 00:44:33 +0000
committerGerrit Code Review <review@openstack.org>2016-07-21 00:44:34 +0000
commiteec3a2b9e8df358178eaea7069107fdd7df15ef3 (patch)
treec2fa7316bbee74f933f181c4fbb36faf586e3c69 /nova
parent4e4adb5039703ce0c372af2d15b60a52428557e5 (diff)
parent916f01ef7d49234f2d537a1cc8a9b6b563bdac18 (diff)
downloadnova-eec3a2b9e8df358178eaea7069107fdd7df15ef3.tar.gz
Merge "Bump service version for BuildRequest deletion"
Diffstat (limited to 'nova')
-rw-r--r--nova/objects/service.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/objects/service.py b/nova/objects/service.py
index 4ea69d2814..a3d998b808 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'},
)