Merge "Prevent image become active without disk and container formats"

This commit is contained in:
Zuul 2017-12-08 23:44:42 +00:00 committed by Gerrit Code Review
commit 1aadd06320
1 changed files with 2 additions and 3 deletions

View File

@ -150,9 +150,8 @@ class Image(object):
LOG.debug(e)
raise e
if self._status == 'queued' and status in ('saving',
'active',
'importing'):
if self._status in ('queued', 'uploading') and status in (
'saving', 'active', 'importing'):
missing = [k for k in ['disk_format', 'container_format']
if not getattr(self, k)]
if len(missing) > 0: