From ff12c80be4c553ead48de17189b15b3c5af00c68 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Fri, 8 Nov 2013 16:30:18 +0100
Subject: [PATCH] Install Guide: Merge two steps in Neutron Install

Steps 6 and 8 were referencing the same files while step 7
used another one. Let's merge the steps as proposed in the bug.

Change-Id: I8d379055db86f83bee181632aa84cec891cb9880
backport: havana
Closes-Bug: 1245914
---
 doc/install-guide/section_neutron-install.xml | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/doc/install-guide/section_neutron-install.xml b/doc/install-guide/section_neutron-install.xml
index 190add61e3..8714ed913a 100644
--- a/doc/install-guide/section_neutron-install.xml
+++ b/doc/install-guide/section_neutron-install.xml
@@ -391,35 +391,27 @@ GATEWAY=EXTERNAL_INTERFACE_GATEWAY</programlisting>
           <!-- TODO(sross): support other distros -->
           <step>
             <para>You must set some common configuration options no
-              matter which networking technology you choose to use
-              with Open vSwitch. You must configure a L3 agent and
-              DHCP agent. Edit the
+            matter which networking technology you choose to use with
+            Open vSwitch. Configure the L3 and DHCP agents to use
+            <acronym>OVS</acronym> and namespaces. Edit the
                 <filename>/etc/neutron/l3_agent.ini</filename> and
                 <filename>/etc/neutron/dhcp_agent.ini</filename>
               files, respectively:</para>
-            <programlisting language="ini">interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver</programlisting>
+            <programlisting language="ini">interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+use_namespaces = True</programlisting>
+            <para os="rhel;centos">You must enable veth support if you
+            use certain kernels. Some kernels, such as recent versions
+            of RHEL (not RHOS) and CentOS, only partially support
+            namespaces. Edit the previous
+              files, as follows:</para>
+            <programlisting language="ini" os="rhel;centos">ovs_use_veth = True</programlisting>
           </step>
           <step os="rhel;centos;fedora;opensuse;sles;ubuntu">
             <para>Similarly, you must also tell Neutron core to use
                 <acronym>OVS</acronym>. Edit the
-                <filename>/etc/neutron/neutron.conf</filename>:</para>
+                <filename>/etc/neutron/neutron.conf</filename> file:</para>
             <programlisting language="ini">core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2</programlisting>
           </step>
-          <step>
-            <para>Tell the L3 and DHCP agents that you want to use
-              namespaces. To do so, edit the
-                <filename>/etc/neutron/l3_agent.ini</filename> and
-                <filename>/etc/neutron/dhcp_agent.ini</filename>
-              files, respectively:</para>
-            <programlisting language="ini">use_namespaces = True</programlisting>
-
-            <para os="rhel;centos">Additionally, if you a using
-              certain kernels with partial support for namespaces
-              (such as some recent versions of RHEL (not RHOS) and
-              CentOS), you must enable veth support. Edit the previous
-              files, as follows:</para>
-            <programlisting language="ini" os="rhel;centos">ovs_use_veth = True</programlisting>
-          </step>
           <step>
             <para>Choose a networking technology to create the virtual
               networks. Neutron supports GRE tunneling, VLANs, and