Merge "Ignore connection errors when getting ironic ports"

openshift-metal3 · Sep 20, 2022 · a2204ea · a2204ea
2 parents 493cee3 + d14cd50
commit a2204ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ironic_inspector/pxe_filter/dnsmasq.py b/ironic_inspector/pxe_filter/dnsmasq.py
@@ -28,6 +28,7 @@
 import os
 import time
 
+from keystoneauth1 import exceptions as ksa_exc
 from openstack import exceptions as os_exc
 from oslo_concurrency import processutils
 from oslo_config import cfg
@@ -90,7 +91,7 @@ def _sync(self, ironic):
 
             # ironic_macs are all the MACs know to ironic (all ironic ports)
             ironic_macs = pxe_filter.get_ironic_macs(ironic)
-        except os_exc.SDKException:
+        except (os_exc.SDKException, ksa_exc.ConnectFailure):
             LOG.exception(
                 "Could not list ironic ports, can not sync dnsmasq PXE filter")
             return

diff --git a/ironic_inspector/pxe_filter/iptables.py b/ironic_inspector/pxe_filter/iptables.py
@@ -13,6 +13,7 @@
 
 import contextlib
 
+from keystoneauth1 import exceptions as ksa_exc
 from openstack import exceptions as os_exc
 from oslo_concurrency import processutils
 from oslo_config import cfg
@@ -118,7 +119,7 @@ def sync(self, ironic):
             else:
                 to_deny = pxe_filter.get_inactive_macs(ironic)
                 to_allow = None
-        except os_exc.SDKException:
+        except (os_exc.SDKException, ksa_exc.ConnectFailure):
             LOG.exception(
                 "Could not list ironic ports, iptables PXE filter can not "
                 "be synced")