From 6d2e9eed4ba01bb067aedc5d7c2d899b4af18ee6 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Fri, 2 Aug 2019 13:58:11 +0000
Subject: [PATCH] Revert "Stop using veth pairs to connect qdhcp ns"

Reverting as this change causes existing qdhcp namespaces to become
inaccessible.

This reverts commit 7578326c592a81e6cc6737f360fc2b15ed175cf0.

Change-Id: I295fb21dc66b86a5259cb7ae06a92766cf246675
---
 hooks/charmhelpers/contrib/python/__init__.py | 0
 templates/icehouse/dhcp_agent.ini             | 2 +-
 templates/mitaka/dhcp_agent.ini               | 2 +-
 templates/ocata/dhcp_agent.ini                | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 hooks/charmhelpers/contrib/python/__init__.py

diff --git a/hooks/charmhelpers/contrib/python/__init__.py b/hooks/charmhelpers/contrib/python/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/templates/icehouse/dhcp_agent.ini b/templates/icehouse/dhcp_agent.ini
index 3db3b6ba..a49feef7 100644
--- a/templates/icehouse/dhcp_agent.ini
+++ b/templates/icehouse/dhcp_agent.ini
@@ -17,4 +17,4 @@ dnsmasq_config_file = /etc/neutron/dnsmasq.conf
 enable_metadata_network = True
 enable_isolated_metadata = True
 
-ovs_use_veth = False
+ovs_use_veth = True
diff --git a/templates/mitaka/dhcp_agent.ini b/templates/mitaka/dhcp_agent.ini
index ead680fa..224d2c2e 100644
--- a/templates/mitaka/dhcp_agent.ini
+++ b/templates/mitaka/dhcp_agent.ini
@@ -30,7 +30,7 @@ dhcp_domain = {{ dns_domain }}
 enable_metadata_network = True
 enable_isolated_metadata = True
 
-ovs_use_veth = False
+ovs_use_veth = True
 
 [AGENT]
 {% if availability_zone -%}
diff --git a/templates/ocata/dhcp_agent.ini b/templates/ocata/dhcp_agent.ini
index 64dc70c9..1c3cd3b7 100644
--- a/templates/ocata/dhcp_agent.ini
+++ b/templates/ocata/dhcp_agent.ini
@@ -31,7 +31,7 @@ enable_metadata_network = True
 force_metadata = True
 enable_isolated_metadata = True
 
-ovs_use_veth = False
+ovs_use_veth = True
 
 [AGENT]
 {% if availability_zone -%}