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
openstack-archive · Jun 23, 2016 · 6eb6447 · 6eb6447
1 parent 4c8d906
commit 6eb6447
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/poppy/model/ssl_certificate.py b/poppy/model/ssl_certificate.py
@@ -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',

diff --git a/poppy/transport/pecan/controllers/v1/admin.py b/poppy/transport/pecan/controllers/v1/admin.py
@@ -70,7 +70,7 @@ def post(self):
         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))