From 9d18b7e065b6be94c4428d768308d61924d86094 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <lists@ryanpetrello.com>
Date: Tue, 17 May 2016 10:07:49 -0400
Subject: [PATCH] Add additional exception handling to ARP cleanup.

This was originally resolved in Mitaka via
http://git.openstack.org/cgit/openstack/astara-appliance/commit/?id=02383adf645c479aba2838602c90fd5135fd0417
Backporting this as it has the potential to break the router build+configure
process.

Closes bug #1582736
Change-Id: I630007e3fb9c33e0cac11ab39b95ba63434ed059
---
 akanda/router/drivers/arp.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/akanda/router/drivers/arp.py b/akanda/router/drivers/arp.py
index b844751..b9d0d3e 100644
--- a/akanda/router/drivers/arp.py
+++ b/akanda/router/drivers/arp.py
@@ -155,4 +155,8 @@ class ARPManager(base.Manager):
         :type ip: str
         :param ip: IP address to search for in the ARP table.
         """
-        self.sudo('-d', ip)
+        try:
+            self.sudo('-d', ip)
+        except:
+            # It's possible that these have already been cleaned up
+            pass