diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-27 23:04:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-27 23:04:27 +0000 |
| commit | 8dc7ff69f24c643167c9e961dd301d7b08291be8 (patch) | |
| tree | cc3f5aae288ea0eeb1510e2d752aa8ba1311b32c /nova/api | |
| parent | c6d75a9027b4355b79a307c27700b3c03d665329 (diff) | |
| parent | b013d80ff7ffa75a823f246445a07cb6970d321e (diff) | |
| download | nova-8dc7ff69f24c643167c9e961dd301d7b08291be8.tar.gz nova-8dc7ff69f24c643167c9e961dd301d7b08291be8.tar.xz nova-8dc7ff69f24c643167c9e961dd301d7b08291be8.zip | |
Merge "Remove broken config_drive image_href support."
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} |