summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-06-04 02:58:03 +0000
committerGerrit Code Review <review@openstack.org>2022-06-04 02:58:03 +0000
commit59620c81a3be6428cecd17232bce942227fe7d4d (patch)
tree694f9deedf67e108b5aca8859ecc43fde05da42b
parent27e4bc656be970ce8764f75331cf7ac51a5d7d0e (diff)
parent790f096364cc7eb1171feee1e17f75d39f8c1d25 (diff)
downloaddesignate-59620c81a3be6428cecd17232bce942227fe7d4d.tar.gz
Merge "Fix incorrect 404 error on floating IP create" into stable/wallaby
-rw-r--r--designate/central/service.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/designate/central/service.py b/designate/central/service.py
index 135bb341..e65429e3 100644
--- a/designate/central/service.py
+++ b/designate/central/service.py
@@ -2336,8 +2336,12 @@ class Service(service.RPCService):
# RS or Zone.
if record and record.action != 'DELETE':
if not recordset:
- recordset = self.storage.get_recordset(
- elevated_context, record.recordset_id)
+ try:
+ recordset = self.storage.get_recordset(
+ elevated_context, record.recordset_id)
+ except exceptions.RecordSetNotFound:
+ LOG.debug('No recordset found for %s', fip['id'])
+ return fip_ptr
fip_ptr['action'] = recordset.action
fip_ptr['status'] = recordset.status