x
/
poppy
Code Issues Proposed changes

Workaround allow certs of type dedicated 

Prior to this migrating a domain via admin endpoints
would fail because "dedicated" cert_type is not allowed.

Change-Id: Ifb6ea9a8798894bc66e2d16fd8b8a16436bfdaf4
This commit is contained in:
Isaac Mungai 2016-06-23 14:38:16 -04:00
parent 4c8d9061f1
commit 6eb64473fe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
poppy/model/ssl_certificate.py
View File

@ -16,7 +16,7 @@
from poppy.model import common
VALID_CERT_TYPES = [u'san', u'custom']
VALID_CERT_TYPES = [u'san', u'custom', u'dedicated']
VALID_STATUS_IN_CERT_DETAIL = [
u'deployed',
u'create_in_progress',

2
poppy/transport/pecan/controllers/v1/admin.py
View File

@ -70,7 +70,7 @@ class DomainMigrationController(base.Controller, hooks.HookController):
except errors.ServiceNotFound:
pecan.abort(404, detail='Service {0} could not be found'.format(
service_id))
except LookupError:
except (LookupError, ValueError):
pecan.abort(404, detail='Domain {0} could not be found'.format(
domain_name))