From df0a4e0990edd9426a47ba5becab71c4f5f319fc Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 19 May 2016 17:22:26 -0400 Subject: [PATCH] Bump the service version for get-me-a-network support The REST API is going to be checking that all computes in the deployment are running new enough code to support network requests with the special 'auto' and 'none' values for Get Me a Network, so we need to bump the service version which can be used as the minimum version to check. Part of blueprint get-me-a-network Change-Id: Ia1af75422d5e1fd4535c1ed9703d855239282559 --- 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 e6d51530fadf..fd7605e784ba 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": 11 + "version": 12 } }, "event_type": "service.update", diff --git a/nova/objects/service.py b/nova/objects/service.py index f69996a9ca1c..9897a9e4189f 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 = 11 +SERVICE_VERSION = 12 # NOTE(danms): This is our SERVICE_VERSION history. The idea is that any @@ -76,6 +76,9 @@ SERVICE_VERSION_HISTORY = ( {'compute_rpc': '4.11'}, # Version 11: Removed migration_id from live_migration_force_complete {'compute_rpc': '4.12'}, + # Version 12: The network APIs and compute manager support a NetworkRequest + # object where the network_id value is 'auto' or 'none'. + {'compute_rpc': '4.12'}, )