diff --git a/neutron/services/trunk/drivers/openvswitch/agent/driver.py b/neutron/services/trunk/drivers/openvswitch/agent/driver.py index e140dbd0fba..c24ac62d2bc 100644 --- a/neutron/services/trunk/drivers/openvswitch/agent/driver.py +++ b/neutron/services/trunk/drivers/openvswitch/agent/driver.py @@ -105,4 +105,7 @@ def init_handler(resource, event, trigger, payload=None): def unregister(): """Cleanup fanout queues""" global TRUNK_SKELETON - TRUNK_SKELETON.unregister() + try: + TRUNK_SKELETON.unregister() + except AttributeError: + pass