From 363ef82a66cb3b3528de03686f79f7c13ef33305 Mon Sep 17 00:00:00 2001 From: Nikola Dipanov Date: Thu, 16 Jul 2015 15:54:47 +0100 Subject: [PATCH] objects: send PciDeviceList 1.2 to all code that can handle it After commit Id743848061d2bcd64d785979c7a11ee7c945f06b has been landed on stable/kilo - it is now safe to send PciDeviceList version 1.2 to all code that can handle it (Instance 1.18 and above). Change-Id: I80ce8ca3b70e5547bbb3d5ffc592633b56c59f96 Closes-bug: #1474074 --- nova/objects/instance.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nova/objects/instance.py b/nova/objects/instance.py index 8f12a68331aa..4af1cd8cb6dc 100644 --- a/nova/objects/instance.py +++ b/nova/objects/instance.py @@ -226,13 +226,7 @@ class Instance(base.NovaPersistentObject, base.NovaObject, 'fault': [('1.0', '1.0'), ('1.13', '1.2')], 'info_cache': [('1.1', '1.0'), ('1.9', '1.4'), ('1.10', '1.5')], 'security_groups': [('1.2', '1.0')], - 'pci_devices': [('1.6', '1.0'), ('1.15', '1.1'), - # FIXME(ndipanov): Currently we don't want to send 1.2 - # to Kilo nodes - they can't handle it and will fail - # due to - # https://bugs.launchpad.net/nova/+bug/1474074 - # Kilo Instance is at 1.19 - ('1.20', '1.2')], + 'pci_devices': [('1.6', '1.0'), ('1.15', '1.1'), ('1.18', '1.2')], 'numa_topology': [('1.14', '1.0'), ('1.16', '1.1')], 'pci_requests': [('1.16', '1.1')], 'tags': [('1.17', '1.0'), ('1.21', '1.1')],