diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-02 00:17:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-02 00:17:07 +0000 |
| commit | a1072dd7da33243326c72256a7ee72f8a815ffd1 (patch) | |
| tree | 29892b4e8a87caa0c37d081b91082cd26144c5fd | |
| parent | e0747fffd74d11bddc5634b616a91eabdf4e12aa (diff) | |
| parent | e0333fa56a0f998a5d44ebeade5b754875c3c7d3 (diff) | |
| download | nova-a1072dd7da33243326c72256a7ee72f8a815ffd1.tar.gz nova-a1072dd7da33243326c72256a7ee72f8a815ffd1.tar.xz nova-a1072dd7da33243326c72256a7ee72f8a815ffd1.zip | |
Merge "Remove deprecation notice in LibvirtBridgeDriver"
| -rw-r--r-- | nova/virt/libvirt/vif.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index 45c299830..78ed848a2 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -205,17 +205,9 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver): class LibvirtBridgeDriver(LibvirtGenericVIFDriver): - """Deprecated in favour of LibvirtGenericVIFDriver. - Retained in Grizzly for compatibility with Quantum + """Retained in Grizzly for compatibility with Quantum drivers which do not yet report 'vif_type' port binding. - To be removed in Hxxxx.""" - - def __init__(self): - LOG.deprecated( - _("LibvirtBridgeDriver is deprecated and " - "will be removed in the Hxxxx release. Please " - "update the 'libvirt_vif_driver' config parameter " - "to use the LibvirtGenericVIFDriver class instead")) + Will be deprecated in Havana, and removed in Ixxxx.""" def get_config(self, instance, network, mapping): return self.get_config_bridge(instance, network, mapping) |