diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2013-05-31 23:13:23 +0000 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2013-06-26 21:04:07 +0000 |
| commit | b013d80ff7ffa75a823f246445a07cb6970d321e (patch) | |
| tree | d803c56441ede5284830404e77da35020c77240b /nova/api | |
| parent | d62e708889498cd22e633d99c40655be82b97c9a (diff) | |
| download | nova-b013d80ff7ffa75a823f246445a07cb6970d321e.tar.gz nova-b013d80ff7ffa75a823f246445a07cb6970d321e.tar.xz nova-b013d80ff7ffa75a823f246445a07cb6970d321e.zip | |
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
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index b9e18b501..8c329d12b 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -919,6 +919,9 @@ class Controller(wsgi.Controller): except exception.KeypairNotFound as error: msg = _("Invalid key_name provided.") raise exc.HTTPBadRequest(explanation=msg) + except exception.ConfigDriveInvalidValue: + msg = _("Invalid config_drive provided.") + raise exc.HTTPBadRequest(explanation=msg) except rpc_common.RemoteError as err: msg = "%(err_type)s: %(err_msg)s" % {'err_type': err.exc_type, 'err_msg': err.value} |