From 7578326c592a81e6cc6737f360fc2b15ed175cf0 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Wed, 19 Jun 2019 13:29:18 +0000 Subject: [PATCH] Stop using veth pairs to connect qdhcp ns veth pairs are currently being used to connect the qdhcp namespace to the underlying bridge. This behaviour appears to only be needed for old kernels with limited namespaces support (pre trusty). Change-Id: If1f669de09e2499e74e88e2b72203047e7f9f957 Closes-Bug: #1832021 --- 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(-) create mode 100644 hooks/charmhelpers/contrib/python/__init__.py diff --git a/hooks/charmhelpers/contrib/python/__init__.py b/hooks/charmhelpers/contrib/python/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/templates/icehouse/dhcp_agent.ini b/templates/icehouse/dhcp_agent.ini index a49feef7..3db3b6ba 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 = True +ovs_use_veth = False diff --git a/templates/mitaka/dhcp_agent.ini b/templates/mitaka/dhcp_agent.ini index 224d2c2e..ead680fa 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 = True +ovs_use_veth = False [AGENT] {% if availability_zone -%} diff --git a/templates/ocata/dhcp_agent.ini b/templates/ocata/dhcp_agent.ini index 1c3cd3b7..64dc70c9 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 = True +ovs_use_veth = False [AGENT] {% if availability_zone -%}