From b013d80ff7ffa75a823f246445a07cb6970d321e Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Fri, 31 May 2013 23:13:23 +0000 Subject: Remove broken config_drive image_href support. image_href support has not been working since at least shortly before Folsom release. This is a good indication that this functionality is not used. As far as I can tell, the docs also do not match what was supported. An image ID was required, but docs show examples with full hrefs. DocImpact http://docs.openstack.org/developer/nova/api_ext/ext_config_drive.html References to supporting image_hrefs should be removed. This patch also removes the hack that passed a config_drive_id via the Instance dictionary when config_drive_id is not a valid Column for Instance. Fixes bug 1186401 Change-Id: Iced7bc8e278cb9f208183f1dbb7a293675a47eae --- nova/virt/configdrive.py | 4 ---- nova/virt/libvirt/blockinfo.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'nova/virt') diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py index 173dd457b..d4038457f 100644 --- a/nova/virt/configdrive.py +++ b/nova/virt/configdrive.py @@ -179,7 +179,3 @@ class ConfigDriveBuilder(object): def required_by(instance): return instance.get('config_drive') or CONF.force_config_drive - - -def enabled_for(instance): - return required_by(instance) or instance.get('config_drive_id') diff --git a/nova/virt/libvirt/blockinfo.py b/nova/virt/libvirt/blockinfo.py index aabcef964..55bf4fcd1 100644 --- a/nova/virt/libvirt/blockinfo.py +++ b/nova/virt/libvirt/blockinfo.py @@ -411,7 +411,7 @@ def get_disk_mapping(virt_type, instance, 'dev': disk_dev, 'type': 'disk'} - if configdrive.enabled_for(instance): + if configdrive.required_by(instance): config_info = get_next_disk_info(mapping, disk_bus, last_device=True) -- cgit