Merge "Handle flavor disk mismatches when resizing"

This commit is contained in:
Zuul 2020-05-28 16:34:18 +00:00 committed by Gerrit Code Review
commit 3233392365
1 changed files with 2 additions and 4 deletions

View File

@ -58,6 +58,8 @@ INVALID_FLAVOR_IMAGE_EXCEPTIONS = (
exception.BadRequirementEmulatorThreadsPolicy,
exception.CPUThreadPolicyConfigurationInvalid,
exception.FlavorImageConflict,
exception.FlavorDiskTooSmall,
exception.FlavorMemoryTooSmall,
exception.ImageCPUPinningForbidden,
exception.ImageCPUThreadPolicyForbidden,
exception.ImageNUMATopologyAsymmetric,
@ -725,8 +727,6 @@ class ServersController(wsgi.Controller):
exception.ImageUnacceptable,
exception.FixedIpNotFoundForAddress,
exception.FlavorNotFound,
exception.FlavorDiskTooSmall,
exception.FlavorMemoryTooSmall,
exception.InvalidMetadata,
exception.InvalidVolume,
exception.MismatchVolumeAZException,
@ -1125,8 +1125,6 @@ class ServersController(wsgi.Controller):
raise exc.HTTPForbidden(explanation=error.format_message())
except (exception.AutoDiskConfigDisabledByImage,
exception.CertificateValidationFailed,
exception.FlavorDiskTooSmall,
exception.FlavorMemoryTooSmall,
exception.ImageNotActive,
exception.ImageUnacceptable,
exception.InvalidMetadata,