Merge "Update rpc version aliases for kilo" into stable/kilo2015.1.0rc32015.1.0

7 files changed, 30 insertions, 8 deletions

diff --git a/nova/cells/rpcapi.py b/nova/cells/rpcapi.py
index aa5654d836..13f4a0feeb 100644
--- a/nova/cells/rpcapi.py
+++ b/nova/cells/rpcapi.py
@@ -108,6 +108,10 @@ class CellsAPI(object):
         * 1.33 - Add clean_shutdown to resize_instance()
         * 1.34 - build_instances uses BlockDeviceMapping objects, drops
                  legacy_bdm argument
+
+        ... Kilo supports message version 1.34.  So, any changes to
+        existing methods in 1.x after that point should be done such that they
+        can handle the version_cap being set to 1.34.
     '''
 
     VERSION_ALIASES = {
@@ -115,6 +119,7 @@ class CellsAPI(object):
         'havana': '1.24',
         'icehouse': '1.27',
         'juno': '1.29',
+        'kilo': '1.34',
     }
 
     def __init__(self):
diff --git a/nova/cert/rpcapi.py b/nova/cert/rpcapi.py
index 570707add8..aeda163559 100644
--- a/nova/cert/rpcapi.py
+++ b/nova/cert/rpcapi.py
@@ -49,9 +49,9 @@ class CertAPI(object):
 
         2.0 - Major API rev for Icehouse
 
-        ... Icehouse and Juno support message version 2.0.  So, any changes to
-        existing methods in 2.x after that point should be done such that they
-        can handle the version_cap being set to 2.0.
+        ... Icehouse, Juno and Kilo support message version 2.0.  So, any
+        changes to existing methods in 2.x after that point should be done such
+        that they can handle the version_cap being set to 2.0.
     '''
 
     VERSION_ALIASES = {
@@ -59,6 +59,7 @@ class CertAPI(object):
         'havana': '1.1',
         'icehouse': '2.0',
         'juno': '2.0',
+        'kilo': '2.0',
     }
 
     def __init__(self):
diff --git a/nova/conductor/rpcapi.py b/nova/conductor/rpcapi.py
index c5ed7137c1..b4a7adaf53 100644
--- a/nova/conductor/rpcapi.py
+++ b/nova/conductor/rpcapi.py
@@ -159,6 +159,11 @@ class ConductorAPI(object):
     * 2.1  - Make notify_usage_exists() take an instance object
     * Remove bw_usage_update()
     * Remove notify_usage_exists()
+
+    ... Kilo supports message version 2.1.  So, any changes to
+    existing methods in 2.x after that point should be done such
+    that they can handle the version_cap being set to 2.1.
+
     """
 
     VERSION_ALIASES = {
@@ -166,6 +171,7 @@ class ConductorAPI(object):
         'havana': '1.58',
         'icehouse': '2.0',
         'juno': '2.0',
+        'kilo': '2.1',
     }
 
     def __init__(self):
diff --git a/nova/console/rpcapi.py b/nova/console/rpcapi.py
index 5632e77a19..c3b08c236d 100644
--- a/nova/console/rpcapi.py
+++ b/nova/console/rpcapi.py
@@ -49,9 +49,9 @@ class ConsoleAPI(object):
 
         2.0 - Major API rev for Icehouse
 
-        ... Icehouse and Juno support message version 2.0.  So, any changes to
-        existing methods in 2.x after that point should be done such that they
-        can handle the version_cap being set to 2.0.
+        ... Icehouse, Juno and Kilo support message version 2.0.  So, any
+        changes to existing methods in 2.x after that point should be done such
+        that they can handle the version_cap being set to 2.0.
     '''
 
     VERSION_ALIASES = {
@@ -59,6 +59,7 @@ class ConsoleAPI(object):
         'havana': '1.1',
         'icehouse': '2.0',
         'juno': '2.0',
+        'kilo': '2.0',
     }
 
     def __init__(self, topic=None, server=None):
diff --git a/nova/consoleauth/rpcapi.py b/nova/consoleauth/rpcapi.py
index c005c8b633..4be808e749 100644
--- a/nova/consoleauth/rpcapi.py
+++ b/nova/consoleauth/rpcapi.py
@@ -49,6 +49,10 @@ class ConsoleAuthAPI(object):
         can handle the version_cap being set to 2.0.
 
         * 2.1 - Added access_url to authorize_console
+
+        ... Kilo support message version 2.1.  So, any changes to existing
+        methods in 2.x after that point should be done such that they can
+        handle the version_cap being set to 2.1.
     '''
 
     VERSION_ALIASES = {
@@ -56,6 +60,7 @@ class ConsoleAuthAPI(object):
         'havana': '1.2',
         'icehouse': '2.0',
         'juno': '2.0',
+        'kilo': '2.1',
     }
 
     def __init__(self):
diff --git a/nova/network/rpcapi.py b/nova/network/rpcapi.py
index a878df4d79..b87e420367 100644
--- a/nova/network/rpcapi.py
+++ b/nova/network/rpcapi.py
@@ -84,7 +84,7 @@ class NetworkAPI(object):
         * 1.13 - Convert allocate_for_instance()
                  to use NetworkRequestList objects
 
-        ... Juno supports message version 1.13.  So, any changes to
+        ... Juno and Kilo supports message version 1.13.  So, any changes to
         existing methods in 1.x after that point should be done such that they
         can handle the version_cap being set to 1.13.
 
@@ -110,6 +110,7 @@ class NetworkAPI(object):
         'havana': '1.10',
         'icehouse': '1.12',
         'juno': '1.13',
+        'kilo': '1.13',
     }
 
     def __init__(self, topic=None):
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py
index 6cf4c02668..c8eb901464 100644
--- a/nova/scheduler/rpcapi.py
+++ b/nova/scheduler/rpcapi.py
@@ -91,6 +91,9 @@ class SchedulerAPI(object):
         * 4.2 - Added update_instance_info(), delete_instance_info(), and
                 sync_instance_info()  methods
 
+        ... Kilo support message version 4.2. So, any changes to existing
+        methods in 4.x after that point should be done such that they can
+        handle the version_cap being set to 4.2.
 
     '''
 
@@ -99,7 +102,7 @@ class SchedulerAPI(object):
         'havana': '2.9',
         'icehouse': '3.0',
         'juno': '3.0',
-        'kilo': '4.0',
+        'kilo': '4.2',
     }
 
     def __init__(self):