From 09e0ef8958b1b893cf82cf35366733d2ece132ba Mon Sep 17 00:00:00 2001
From: phil-hopkins-a <phil.hopkins@rackspace.com>
Date: Mon, 2 Feb 2015 11:01:12 -0600
Subject: [PATCH] Configures namespace deletion

Add option to the L3 and DHCP agent configuration to
enable automatic deletion of router and DHCP namespaces
when the router or network is deleted.

Change-Id: I75d5eb4bac4b1d163b44f7ea27db01b62a80bedd
backport: Juno
Closes-Bug: 1404941
---
 .../section_neutron-network-node.xml          | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/doc/install-guide/section_neutron-network-node.xml b/doc/install-guide/section_neutron-network-node.xml
index 673ba08994..bfda008fbe 100644
--- a/doc/install-guide/section_neutron-network-node.xml
+++ b/doc/install-guide/section_neutron-network-node.xml
@@ -232,13 +232,21 @@ tunnel_types = gre</programlisting>
           <para>In the <literal>[DEFAULT]</literal> section, configure
             the driver, enable
             <glossterm baseform="network namespace">network
-            namespaces</glossterm>, and configure the external
-            network bridge:</para>
+            namespaces</glossterm>, configure the external network bridge
+            and enable deletion of defunct router namespaces:</para>
           <programlisting language="ini">[DEFAULT]
 ...
 interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 use_namespaces = True
-external_network_bridge = br-ex</programlisting>
+external_network_bridge = br-ex
+router_delete_namespaces = True</programlisting>
+          <note os="sles">
+            <para>Due to an issue with old versions of the
+              <application>iproute2</application> utility, we recommend
+              that you do not configure the
+              <option>router_delete_namespaces</option> option on SLES 11
+              SP3.</para>
+            </note>
         </step>
         <step>
           <para>(Optional) To assist with troubleshooting,
@@ -262,12 +270,21 @@ verbose = True</programlisting>
       <substeps>
         <step>
           <para>In the <literal>[DEFAULT]</literal> section, configure
-            the drivers and enable namespaces:</para>
+            the drivers, enable namespaces and enable deletion of defunct
+            DHCP namespaces:</para>
           <programlisting language="ini">[DEFAULT]
 ...
 interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
-use_namespaces = True</programlisting>
+use_namespaces = True
+dhcp_delete_namespaces = True</programlisting>
+          <note os="sles">
+            <para>Due to an issue with old versions of the
+              <application>iproute2</application> utility, we recommend
+              that you do not configure the
+              <option>dhcp_delete_namespaces</option> option on SLES 11
+              SP3.</para>
+            </note>
         </step>
         <step>
           <para>(Optional) To assist with troubleshooting,